From b0f661181d10bddc08e380992590a1cdd92be92b Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Fri, 21 Aug 2015 11:18:45 -0700 Subject: Down-integrate from internal branch. Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 --- src/google/protobuf/stubs/hash.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/google/protobuf/stubs/hash.h') 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 -- cgit v1.2.3