Use stlport hash_set/hash_map when and only when MOZC_USE_STLPORT is defined
Now we are allowing to configure which STL is used in Android build. Hence we shouldn't expect <hash_map>/<hash_set> are always available in Android build.
BUG=none
TEST=unittest
git-svn-id: https://mozc.googlecode.com/svn/trunk@437 a6090854-d499-a067-5803-1114d4e51264
diff --git a/src/base/hash_tables.h b/src/base/hash_tables.h
index 2d9bc85..c166aaf 100644
--- a/src/base/hash_tables.h
+++ b/src/base/hash_tables.h
@@ -46,11 +46,11 @@
#endif
#else // not OS_WIN
-#ifdef OS_ANDROID
+#ifdef MOZC_USE_STLPORT
// Use stlport hash_set/hash_map for android.
#include <hash_map>
#include <hash_set>
-#else // not OS_ANDROID
+#else // not MOZC_USE_STLPORT
#include <ext/hash_map>
#include <ext/hash_set>
@@ -71,7 +71,7 @@
}
};
}
-#endif // not OS_ANDROID
+#endif // not MOZC_USE_STLPORT
#endif // not OS_WIN
#endif // MOZC_BASE_HASH_TABLES_H_
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index ae56d33..3d5ceda 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=16
-BUILD=1977
+BUILD=1978
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
