diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-06 03:38:14 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-06 03:38:14 -0800 |
| commit | 566e944f39ede694fb85944ee7321926ff2dba46 (patch) | |
| tree | 00e339f41f4b1381d6171d59a4fc21e1a6187047 /native/jni/src/utils/hash_map_compat.h | |
| parent | e5cac373190d29645c1fc11bd0ca1bfcdaa9f07e (diff) | |
| parent | ca0a0da8640d1469cb460120ff0aede2322c6802 (diff) | |
| download | latinime-566e944f39ede694fb85944ee7321926ff2dba46.tar.gz latinime-566e944f39ede694fb85944ee7321926ff2dba46.tar.xz latinime-566e944f39ede694fb85944ee7321926ff2dba46.zip | |
am ca0a0da8: Switch to C++11
* commit 'ca0a0da8640d1469cb460120ff0aede2322c6802':
Switch to C++11
Diffstat (limited to 'native/jni/src/utils/hash_map_compat.h')
| -rw-r--r-- | native/jni/src/utils/hash_map_compat.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/native/jni/src/utils/hash_map_compat.h b/native/jni/src/utils/hash_map_compat.h index a1e982bc4..7bf35a660 100644 --- a/native/jni/src/utils/hash_map_compat.h +++ b/native/jni/src/utils/hash_map_compat.h @@ -17,18 +17,12 @@ #ifndef LATINIME_HASH_MAP_COMPAT_H #define LATINIME_HASH_MAP_COMPAT_H -// TODO: Use std::unordered_map that has been standardized in C++11 +#include <unordered_map> -#ifdef __APPLE__ -#include <ext/hash_map> -#else // __APPLE__ -#include <hash_map> -#endif // __APPLE__ +#define hash_map_compat std::unordered_map -#ifdef __SGI_STL_PORT -#define hash_map_compat stlport::hash_map -#else // __SGI_STL_PORT -#define hash_map_compat __gnu_cxx::hash_map -#endif // __SGI_STL_PORT +#if 0 // TODO: Use this instead of the above macro. +template <typename TKey, typename TValue> using hash_map_compat = std::unordered_map<TKey, TValue>; +#endif #endif // LATINIME_HASH_MAP_COMPAT_H |