diff options
| author |  Bo Yang <teboring@google.com> | 2015-08-23 10:45:14 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-08-25 17:58:48 -0700 |
| commit | ff7bdad231d037802fd457ee4fd65e0291d366d7 (patch) | |
| tree | 12f437b32201cdbbfade6d63193e15483640716d /src/google/protobuf/stubs/hash.h | |
| parent | 839b180dbae98adf6caa54d0fb87b8d0a43081dc (diff) | |
Fix bugs on windows
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rwxr-xr-x | src/google/protobuf/stubs/hash.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 0d94ad80..c6f210f0 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -103,8 +103,8 @@ # define GOOGLE_PROTOBUF_HAS_CXX11_HASH # define GOOGLE_PROTOBUF_HASH_COMPARE std::hash_compare # elif _MSC_VER >= 1500 // Since Visual Studio 2008 -# define GOOGLE_PROTOBUF_HAS_TR1 -# define GOOGLE_PROTOBUF_HASH_COMPARE stdext::hash_compare +# undef GOOGLE_PROTOBUF_HAVE_HASH_MAP +# undef GOOGLE_PROTOBUF_HAVE_HASH_SET # elif _MSC_VER >= 1310 # define GOOGLE_PROTOBUF_HASH_NAMESPACE stdext # include <hash_map> @@ -143,20 +143,10 @@ # define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set #endif -#ifndef GOOGLE_PROTOBUF_HASH_NAMESPACE -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END -#elif !defined(GOOGLE_PROTOBUF_HAS_CXX11_HASH) && \ - defined(GOOGLE_PROTOBUF_HAS_TR1) -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ - namespace std { \ - namespace tr1 { +# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ + namespace google { \ + namespace protobuf { # define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END }} -#else -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \ - namespace GOOGLE_PROTOBUF_HASH_NAMESPACE { -# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END } -#endif #undef GOOGLE_PROTOBUF_HAS_CXX11_HASH #undef GOOGLE_PROTOBUF_HAS_TR1 |