organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

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

Browse source 
Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.
This commit is contained in:
Feng Xiao 2015-05-22 15:56:34 -07:00
commit 55df12194f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/stubs/hash.h
View file

@ -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 <>