Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make maps fields work on installed C++ protobufs.
Change-Id: Id937e25bbb35968ee76c92bd4a8ce6247408c443
- Loading branch information
Showing
8 changed files
with
92 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
HASH_MAP_CLASS | ||
HASH_MAP_H | ||
HASH_NAMESPACE | ||
HASH_SET_CLASS | ||
HASH_SET_H | ||
HAVE_HASH_MAP | ||
HAVE_HASH_SET |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* protobuf config.h for MSVC. On other platforms, this is generated | ||
* automatically by autoheader / autoconf / configure. */ | ||
|
||
/* the location of <hash_map> */ | ||
#define GOOGLE_PROTOBUF_HASH_MAP_H <hash_map> | ||
|
||
/* the namespace of hash_map/hash_set */ | ||
// Apparently Microsoft decided to move hash_map *back* to the std namespace | ||
// in MSVC 2010: | ||
// http://blogs.msdn.com/vcblog/archive/2009/05/25/stl-breaking-changes-in-visual-studio-2010-beta-1.aspx | ||
// TODO(kenton): Use unordered_map instead, which is available in MSVC 2010. | ||
#if _MSC_VER < 1310 || _MSC_VER >= 1600 | ||
#define GOOGLE_PROTOBUF_HASH_NAMESPACE std | ||
#else | ||
#define GOOGLE_PROTOBUF_HASH_NAMESPACE stdext | ||
#endif | ||
|
||
/* the location of <hash_set> */ | ||
#define GOOGLE_PROTOBUF_HASH_SET_H <hash_set> | ||
|
||
/* define if the compiler has hash_map */ | ||
#define GOOGLE_PROTOBUF_HAVE_HASH_MAP 1 | ||
|
||
/* define if the compiler has hash_set */ | ||
#define GOOGLE_PROTOBUF_HAVE_HASH_SET 1 | ||
|
||
/* define if you want to use zlib. See readme.txt for additional | ||
* requirements. */ | ||
// #define HAVE_ZLIB 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters