diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
| commit | b0f661181d10bddc08e380992590a1cdd92be92b (patch) | |
| tree | d9291cf324a72206ae3e474fe49186e8c96b2a9e /src/google/protobuf/stubs/hash.h | |
| parent | d119a275495b7dcc9c389c9c650ebd83de265511 (diff) | |
| download | protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.tar.gz protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.tar.bz2 protobuf-b0f661181d10bddc08e380992590a1cdd92be92b.zip | |
Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rwxr-xr-x | src/google/protobuf/stubs/hash.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 9a6b217a..0d94ad80 100755 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -143,6 +143,21 @@ # 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_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 |