| OLD | NEW |
|---|
| (Empty) |
| 1 /* Modified for Chromium to support stlport and libc++ adaptively */ | |
| 2 /* protobuf config.h for MSVC. On other platforms, this is generated | |
| 3 * automatically by autoheader / autoconf / configure. */ | |
| 4 | |
| 5 // NOTE: if you add new macros in this file manually, please propagate the macro | |
| 6 // to vsprojects/config.h. | |
| 7 | |
| 8 /* the namespace of hash_map/hash_set */ | |
| 9 // Apparently Microsoft decided to move hash_map *back* to the std namespace | |
| 10 // in MSVC 2010: | |
| 11 // http://blogs.msdn.com/vcblog/archive/2009/05/25/stl-breaking-changes-in-vis
ual-studio-2010-beta-1.aspx | |
| 12 // And.. they are moved back to stdext in MSVC 2013 (haven't checked 2012). That | |
| 13 // said, use unordered_map for MSVC 2010 and beyond is our safest bet. | |
| 14 #if _MSC_VER >= 1600 | |
| 15 #define GOOGLE_PROTOBUF_HASH_NAMESPACE std | |
| 16 #define GOOGLE_PROTOBUF_HASH_MAP_H <unordered_map> | |
| 17 #define GOOGLE_PROTOBUF_HASH_MAP_CLASS unordered_map | |
| 18 #define GOOGLE_PROTOBUF_HASH_SET_H <unordered_set> | |
| 19 #define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set | |
| 20 #elif _MSC_VER >= 1310 | |
| 21 #define GOOGLE_PROTOBUF_HASH_NAMESPACE stdext | |
| 22 #define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> | |
| 23 #define GOOGLE_PROTOBUF_HASH_MAP_CLASS hash_map | |
| 24 #define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> | |
| 25 #define GOOGLE_PROTOBUF_HASH_SET_CLASS hash_set | |
| 26 #else | |
| 27 /* the name of <hash_map> */ | |
| 28 #if defined(_LIBCPP_VERSION) | |
| 29 #define GOOGLE_PROTOBUF_HASH_MAP_CLASS unordered_map | |
| 30 #else | |
| 31 #define GOOGLE_PROTOBUF_HASH_MAP_CLASS hash_map | |
| 32 #endif | |
| 33 | |
| 34 /* the location of <unordered_map> or <hash_map> */ | |
| 35 #if defined(USE_STLPORT) | |
| 36 #define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> | |
| 37 #elif defined(_LIBCPP_VERSION) | |
| 38 #define GOOGLE_PROTOBUF_HASH_MAP_H <unordered_map> | |
| 39 #else | |
| 40 #define GOOGLE_PROTOBUF_HASH_MAP_H <ext/hash_map> | |
| 41 #endif | |
| 42 | |
| 43 /* the namespace of hash_map/hash_set */ | |
| 44 #if defined(USE_STLPORT) || defined(_LIBCPP_VERSION) | |
| 45 #define GOOGLE_PROTOBUF_HASH_NAMESPACE std | |
| 46 #else | |
| 47 #define GOOGLE_PROTOBUF_HASH_NAMESPACE __gnu_cxx | |
| 48 #endif | |
| 49 | |
| 50 /* the name of <hash_set> */ | |
| 51 #if defined(_LIBCPP_VERSION) | |
| 52 #define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set | |
| 53 #else | |
| 54 #define GOOGLE_PROTOBUF_HASH_SET_CLASS hash_set | |
| 55 #endif | |
| 56 | |
| 57 /* the location of <unordered_set> or <hash_set> */ | |
| 58 #if defined(USE_STLPORT) | |
| 59 #define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> | |
| 60 #elif defined(_LIBCPP_VERSION) | |
| 61 #define GOOGLE_PROTOBUF_HASH_SET_H <unordered_set> | |
| 62 #else | |
| 63 #define GOOGLE_PROTOBUF_HASH_SET_H <ext/hash_set> | |
| 64 #endif | |
| 65 | |
| 66 #endif // _MSC_VER >= 1600 | |
| 67 | |
| 68 /* the location of <hash_set> */ | |
| 69 | |
| 70 /* define if the compiler has hash_map */ | |
| 71 #define GOOGLE_PROTOBUF_HAVE_HASH_MAP 1 | |
| 72 | |
| 73 /* define if the compiler has hash_set */ | |
| 74 #define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1842653006:
Update //third_party/protobuf to version 3. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master