diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-01-08 22:49:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-01-08 22:49:09 -0800 |
| commit | 23c9e9df7b8f02877f07c02564d9048f0257fd6e (patch) | |
| tree | 9630b6df45284e6bdc0cac94e5ae37284235756f /native/jni/src/proximity_info.cpp | |
| parent | 6b25917079ab86082a909793669dca112fd8d2c3 (diff) | |
| parent | 8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf (diff) | |
| download | latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.tar.gz latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.tar.xz latinime-23c9e9df7b8f02877f07c02564d9048f0257fd6e.zip | |
am 8f5f79d7: Merge "Replace assert() with ASSERT() & use -funwind-tables for debug builds"
* commit '8f5f79d7ea824752dcaa4e035e71291e7dd7ddaf':
Replace assert() with ASSERT() & use -funwind-tables for debug builds
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
| -rw-r--r-- | native/jni/src/proximity_info.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index ffe12ce49..8ad9c77dc 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include <cassert> #include <cstring> #define LOG_TAG "LatinIME: proximity_info.cpp" @@ -75,7 +74,7 @@ ProximityInfo::ProximityInfo(JNIEnv *env, const jstring localeJStr, const int ma const jsize localeCStrUtf8Length = env->GetStringUTFLength(localeJStr); if (localeCStrUtf8Length >= MAX_LOCALE_STRING_LENGTH) { AKLOGI("Locale string length too long: length=%d", localeCStrUtf8Length); - assert(false); + ASSERT(false); } memset(mLocaleStr, 0, sizeof(mLocaleStr)); env->GetStringUTFRegion(localeJStr, 0, env->GetStringLength(localeJStr), mLocaleStr); @@ -105,7 +104,7 @@ bool ProximityInfo::hasSpaceProximity(const int x, const int y) const { if (DEBUG_DICT) { AKLOGI("HasSpaceProximity: Illegal coordinates (%d, %d)", x, y); // TODO: Enable this assertion. - //assert(false); + //ASSERT(false); } return false; } @@ -180,7 +179,7 @@ void ProximityInfo::calculateNearbyKeyCodes( inputCodes[insertPos++] = c; if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) { if (DEBUG_DICT) { - assert(false); + ASSERT(false); } return; } @@ -192,7 +191,7 @@ void ProximityInfo::calculateNearbyKeyCodes( inputCodes[insertPos++] = ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE; if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) { if (DEBUG_DICT) { - assert(false); + ASSERT(false); } return; } @@ -213,7 +212,7 @@ void ProximityInfo::calculateNearbyKeyCodes( inputCodes[insertPos++] = ac; if (insertPos >= MAX_PROXIMITY_CHARS_SIZE) { if (DEBUG_DICT) { - assert(false); + ASSERT(false); } return; } |