diff options
Diffstat (limited to '')
| -rw-r--r-- | native/jni/src/defines.h | 3 | ||||
| -rw-r--r-- | native/jni/src/hash_map_compat.h | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 9b530077a..fdfe4ec71 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -211,7 +211,8 @@ static inline void prof_out(void) { #define DICTIONARY_VERSION_MIN 200 #define NOT_VALID_WORD -99 -#define NOT_A_CHARACTER -1 +// TODO: NOT_A_CHARACTER should be -1 +#define NOT_A_CHARACTER 0xFFFF // tentative #define NOT_A_DISTANCE -1 #define NOT_A_COORDINATE -1 #define EQUIVALENT_CHAR_WITHOUT_DISTANCE_INFO -2 diff --git a/native/jni/src/hash_map_compat.h b/native/jni/src/hash_map_compat.h new file mode 100644 index 000000000..116359a73 --- /dev/null +++ b/native/jni/src/hash_map_compat.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2012, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LATINIME_HASH_MAP_COMPAT_H +#define LATINIME_HASH_MAP_COMPAT_H + +// TODO: Use std::unordered_map that has been standardized in C++11 + +#ifdef __APPLE__ +#include <ext/hash_map> +#else // __APPLE__ +#include <hash_map> +#endif // __APPLE__ + +#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 + +#endif // LATINIME_HASH_MAP_COMPAT_H |