Merge pull request protocolbuffers#341 from yukawa/fix-undef-GOOGLE_P…

…ROTOBUF_MISSING_HASH Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
topbrightwen · May 22, 2015 · 55df121 · 55df121
2 parents 48f9594 + cf9f603
commit 55df121
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 <>