diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-08-25 19:43:51 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:25:30 +0300 |
| commit | e82152f267d49cd00cf7fa676697bfe1b7c60ae5 (patch) | |
| tree | 9cebd72d04fd50480ea343f32fc48fc9c075cf20 /3party/protobuf | |
| parent | faba78e0c4db8f820709188146a29495836a660b (diff) | |
[c++11] Backport for gcc 4.6 support
Diffstat (limited to '3party/protobuf')
| -rw-r--r-- | 3party/protobuf/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3party/protobuf/config.h b/3party/protobuf/config.h index e6b7816c94..dea2a3bcfa 100644 --- a/3party/protobuf/config.h +++ b/3party/protobuf/config.h @@ -8,7 +8,7 @@ #ifdef _MSC_VER #define HASH_MAP_H <hash_map> #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_MAP_H <unordered_map> #else #define HASH_MAP_H <tr1/unordered_map> @@ -19,7 +19,7 @@ #ifdef _MSC_VER #define HASH_NAMESPACE stdext #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_NAMESPACE std #else #define HASH_NAMESPACE std::tr1 @@ -33,7 +33,7 @@ #ifdef _MSC_VER #define HASH_SET_H <hash_set> #else - #if __cplusplus > 199711L + #if (__cplusplus > 199711L) || defined(__GXX_EXPERIMENTAL_CXX0X__) #define HASH_SET_H <unordered_set> #else #define HASH_SET_H <tr1/unordered_set> |