diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-08-06 00:31:02 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:23:42 +0300 |
| commit | a43d4251fd32b88569884ca41d4ba22e3de8b045 (patch) | |
| tree | f93e85a40fa718a54b5fe58e5bfef7110b237048 /3party/protobuf | |
| parent | 63c2234ba46f95020f158a440dc675c8b6e16c0a (diff) | |
Base libraries C++11 sources compatibility
Diffstat (limited to '3party/protobuf')
| -rw-r--r-- | 3party/protobuf/config.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/3party/protobuf/config.h b/3party/protobuf/config.h index b96a032b9a..e6b7816c94 100644 --- a/3party/protobuf/config.h +++ b/3party/protobuf/config.h @@ -8,14 +8,22 @@ #ifdef _MSC_VER #define HASH_MAP_H <hash_map> #else - #define HASH_MAP_H <tr1/unordered_map> + #if __cplusplus > 199711L + #define HASH_MAP_H <unordered_map> + #else + #define HASH_MAP_H <tr1/unordered_map> + #endif #endif /* the namespace of hash_map/hash_set */ #ifdef _MSC_VER #define HASH_NAMESPACE stdext #else - #define HASH_NAMESPACE std::tr1 + #if __cplusplus > 199711L + #define HASH_NAMESPACE std + #else + #define HASH_NAMESPACE std::tr1 + #endif #endif /* the name of <hash_set> */ @@ -25,7 +33,11 @@ #ifdef _MSC_VER #define HASH_SET_H <hash_set> #else - #define HASH_SET_H <tr1/unordered_set> + #if __cplusplus > 199711L + #define HASH_SET_H <unordered_set> + #else + #define HASH_SET_H <tr1/unordered_set> + #endif #endif /* Define to 1 if you have the <dlfcn.h> header file. */ |