commit c9d86ea37ff1fae885758c9d62e01110ae8e68cb
author Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> Thu Jul 25 08:57:29 2013 +0530
committer Amit Pundir <amit.pundir@linaro.org> Thu Jul 25 08:57:29 2013 +0530
tree a972cf4e477d15cb68d29c26e402e996cf318a5a
parent a063ccb00e9d8bd983fdb797528d6de5517ac47e

LatinIME: Fix build with -DNDEBUG and gcc 4.6+ -Werror

Fix variables being defined but not used in the NDEBUG
case, needed to fix the build with gcc 4.6+ -Werror

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

native/jni/src/correction.cpp

diff --git a/native/jni/src/correction.cpp b/native/jni/src/correction.cpp
index 61bf3f6..2b1b555 100644
--- a/native/jni/src/correction.cpp
+++ b/native/jni/src/correction.cpp
@@ -42,6 +42,7 @@
 
 inline static void dumpEditDistance10ForDebug(int *editDistanceTable,
         const int editDistanceTableWidth, const int outputLength) {
+#ifndef NDEBUG
     if (DEBUG_DICT) {
         AKLOGI("EditDistanceTable");
         for (int i = 0; i <= 10; ++i) {
@@ -58,6 +59,7 @@
             (void)c; // To suppress compiler warning
         }
     }
+#endif
 }
 
 inline static int getCurrentEditDistance(int *editDistanceTable, const int editDistanceTableWidth,

native/jni/src/unigram_dictionary.cpp

diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp
index a672294..a4b6399 100644
--- a/native/jni/src/unigram_dictionary.cpp
+++ b/native/jni/src/unigram_dictionary.cpp
@@ -254,6 +254,7 @@
     // Note: This line is intentionally left blank
     PROF_END(6);
 
+#ifndef NDEBUG
     if (DEBUG_DICT) {
         queuePool->dumpSubQueue1TopSuggestions();
         for (int i = 0; i < SUB_QUEUE_MAX_COUNT; ++i) {
@@ -273,6 +274,7 @@
             }
         }
     }
+#endif
 }
 
 void UnigramDictionary::initSuggestions(ProximityInfo *proximityInfo, const int *xCoordinates,