diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-05-22 15:56:34 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-05-22 15:56:34 -0700 |
| commit | 55df12194f5f0348c3ddf0636c63ba2b3978fab5 (patch) | |
| tree | 774f0c5d7dcc0bab8c835d41b33b0aa9994ba05c /src/google/protobuf/stubs/hash.h | |
| parent | 48f95941bcdb1ef671943419d93e64a2a95246ec (diff) | |
| parent | cf9f603e8d5a5d88735a1f79f5afb21dbe7085c7 (diff) | |
Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASH
Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
Diffstat (limited to 'src/google/protobuf/stubs/hash.h')
| -rwxr-xr-x | src/google/protobuf/stubs/hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index 11bc2b37..2d69fdc1 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. @@ -200,7 +201,6 @@ class hash_set hash_set(int = 0) {} }; -#undef GOOGLE_PROTOBUF_MISSING_HASH #endif // !GOOGLE_PROTOBUF_MISSING_HASH template <> |