Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASH

Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
10 years ago · 55df12194f
parent 48f95941bc cf9f603e8d
commit 55df12194f
1 changed files with 1 additions and 1 deletions
--- a/src/google/protobuf/stubs/hash.h
+++ b/src/google/protobuf/stubs/hash.h
@ -53,6 +53,7 @@ namespace google {
 namespace protobuf {

 #ifdef GOOGLE_PROTOBUF_MISSING_HASH
+#undef GOOGLE_PROTOBUF_MISSING_HASH

 // This system doesn't have hash_map or hash_set.  Emulate them using map and
 // set.
@ -200,7 +201,6 @@ class hash_set
  hash_set(int = 0) {}
 };

-#undef GOOGLE_PROTOBUF_MISSING_HASH
 #endif  // !GOOGLE_PROTOBUF_MISSING_HASH

 template <>