Chromium Code Reviews Chromium Code Reviews
Issue 246633012:
Import C++11 headers for unordered_(map|set) when using libc++ in protobuf. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 /* config.h. Generated from config.h.in by configure. */ | 1 /* config.h. Generated from config.h.in by configure. */ |
| 2 /* config.h.in. Generated from configure.ac by autoheader. */ | 2 /* config.h.in. Generated from configure.ac by autoheader. */ |
|
rmcilroy
2014/04/25 10:42:24
Please replace this comment to make it clear that
| |
| 3 | 3 |
| 4 /* the name of <hash_set> */ | 4 #include <ciso646> |
| 5 | |
| 6 /* the name of <hash_map> */ | |
|
rmcilroy
2014/04/25 10:42:24
nit - <unordered_map> or <hash_map>
| |
| 7 #if defined(_LIBCPP_VERSION) | |
| 8 #define HASH_MAP_CLASS unordered_map | |
| 9 #else | |
| 5 #define HASH_MAP_CLASS hash_map | 10 #define HASH_MAP_CLASS hash_map |
| 11 #endif | |
| 6 | 12 |
| 7 /* the location of <hash_map> */ | 13 /* the location of <unordered_map> or <hash_map> */ |
| 8 #if defined(USE_STLPORT) | 14 #if defined(USE_STLPORT) |
| 9 #define HASH_MAP_H <hash_map> | 15 #define HASH_MAP_H <hash_map> |
| 16 #elif defined(_LIBCPP_VERSION) | |
| 17 #define HASH_MAP_H <unordered_map> | |
| 10 #else | 18 #else |
| 11 #define HASH_MAP_H <ext/hash_map> | 19 #define HASH_MAP_H <ext/hash_map> |
| 12 #endif | 20 #endif |
| 13 | 21 |
| 14 /* the namespace of hash_map/hash_set */ | 22 /* the namespace of hash_map/hash_set */ |
| 15 #if defined(USE_STLPORT) | 23 #if defined(USE_STLPORT) || defined(_LIBCPP_VERSION) |
| 16 #define HASH_NAMESPACE std | 24 #define HASH_NAMESPACE std |
| 17 #else | 25 #else |
| 18 #define HASH_NAMESPACE __gnu_cxx | 26 #define HASH_NAMESPACE __gnu_cxx |
| 19 #endif | 27 #endif |
| 20 | 28 |
| 21 /* the name of <hash_set> */ | 29 /* the name of <hash_set> */ |
|
rmcilroy
2014/04/25 10:42:24
nit - <unordered_set> or <hash_set>
| |
| 30 #if defined(_LIBCPP_VERSION) | |
| 31 #define HASH_SET_CLASS unordered_set | |
| 32 #else | |
| 22 #define HASH_SET_CLASS hash_set | 33 #define HASH_SET_CLASS hash_set |
| 34 #endif | |
| 23 | 35 |
| 24 /* the location of <hash_set> */ | 36 /* the location of <unordered_set> or <hash_set> */ |
| 25 #if defined(USE_STLPORT) | 37 #if defined(USE_STLPORT) |
| 26 #define HASH_SET_H <hash_set> | 38 #define HASH_SET_H <hash_set> |
| 39 #elif defined(_LIBCPP_VERSION) | |
| 40 #define HASH_SET_H <unordered_set> | |
| 27 #else | 41 #else |
| 28 #define HASH_SET_H <ext/hash_set> | 42 #define HASH_SET_H <ext/hash_set> |
| 29 #endif | 43 #endif |
| 30 | 44 |
| 31 /* Define to 1 if you have the <dlfcn.h> header file. */ | 45 /* Define to 1 if you have the <dlfcn.h> header file. */ |
| 32 #define HAVE_DLFCN_H 1 | 46 #define HAVE_DLFCN_H 1 |
| 33 | 47 |
| 34 /* Define to 1 if you have the <fcntl.h> header file. */ | 48 /* Define to 1 if you have the <fcntl.h> header file. */ |
| 35 #define HAVE_FCNTL_H 1 | 49 #define HAVE_FCNTL_H 1 |
| 36 | 50 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 147 /* Enable extensions on Solaris. */ | 161 /* Enable extensions on Solaris. */ |
| 148 #ifndef __EXTENSIONS__ | 162 #ifndef __EXTENSIONS__ |
| 149 # define __EXTENSIONS__ 1 | 163 # define __EXTENSIONS__ 1 |
| 150 #endif | 164 #endif |
| 151 #ifndef _POSIX_PTHREAD_SEMANTICS | 165 #ifndef _POSIX_PTHREAD_SEMANTICS |
| 152 # define _POSIX_PTHREAD_SEMANTICS 1 | 166 # define _POSIX_PTHREAD_SEMANTICS 1 |
| 153 #endif | 167 #endif |
| 154 #ifndef _TANDEM_SOURCE | 168 #ifndef _TANDEM_SOURCE |
| 155 # define _TANDEM_SOURCE 1 | 169 # define _TANDEM_SOURCE 1 |
| 156 #endif | 170 #endif |
| OLD | NEW |
