diff options
Diffstat (limited to 'chromium/third_party/protobuf/config.h')
| -rw-r--r-- | chromium/third_party/protobuf/config.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/chromium/third_party/protobuf/config.h b/chromium/third_party/protobuf/config.h index dcc0041c2fe..affcf55be5f 100644 --- a/chromium/third_party/protobuf/config.h +++ b/chromium/third_party/protobuf/config.h @@ -1,31 +1,32 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* the name of <hash_set> */ -#define HASH_MAP_CLASS hash_map +#if defined(USE_UNORDERED_CONTAINERS) + +#define HASH_MAP_H <unordered_map> +#define HASH_SET_H <unordered_set> +#define HASH_NAMESPACE std +#define HASH_MAP_CLASS unordered_map +#define HASH_SET_CLASS unordered_set -/* the location of <hash_map> */ -#if defined(USE_STLPORT) -#define HASH_MAP_H <hash_map> #else -#define HASH_MAP_H <ext/hash_map> -#endif -/* the namespace of hash_map/hash_set */ #if defined(USE_STLPORT) +#define HASH_MAP_H <hash_map> +#define HASH_SET_H <hash_set> #define HASH_NAMESPACE std #else +#define HASH_MAP_H <ext/hash_map> +#define HASH_SET_H <ext/hash_set> #define HASH_NAMESPACE __gnu_cxx #endif /* the name of <hash_set> */ +#define HASH_MAP_CLASS hash_map + +/* the name of <hash_set> */ #define HASH_SET_CLASS hash_set -/* the location of <hash_set> */ -#if defined(USE_STLPORT) -#define HASH_SET_H <hash_set> -#else -#define HASH_SET_H <ext/hash_set> #endif /* Define to 1 if you have the <dlfcn.h> header file. */ |