Explorar el Código

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

Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
Feng Xiao hace 10 años
padre
commit
55df12194f
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1 1
      src/google/protobuf/stubs/hash.h

+ 1 - 1
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 <>