From cf9f603e8d5a5d88735a1f79f5afb21dbe7085c7 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Mon, 4 May 2015 01:25:52 -0700 Subject: Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used. This is a follow up CL for df184fba00acc7d4aa7b9d64693c53c815a64eda (Id937e25bbb35968ee76c92bd4a8ce6247408c443), which added #undef GOOGLE_PROTOBUF_MISSING_HASH where GOOGLE_PROTOBUF_MISSING_HASH macro is never defined. With this CL, GOOGLE_PROTOBUF_MISSING_HASH macro will be cleaned up after it is used. --- src/google/protobuf/stubs/hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 82d5052e..93211b72 100755 --- 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. @@ -193,7 +194,6 @@ class hash_set hash_set(int = 0) {} }; -#undef GOOGLE_PROTOBUF_MISSING_HASH #endif // !GOOGLE_PROTOBUF_MISSING_HASH template <> -- cgit v1.2.3