MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kitbash protobuf into compiling

develop
Kelly Kinkade 2022-12-07 13:08:13 -06:00
parent 3552269b46
commit ac0770fbbc
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
depends/protobuf/google/protobuf/stubs/hash.h
Unescape Escape View File

@ -104,7 +104,14 @@
// And.. they are moved back to stdext in MSVC 2013 (haven't checked 2012). That // And.. they are moved back to stdext in MSVC 2013 (haven't checked 2012). That
// said, use unordered_map for MSVC 2010 and beyond is our safest bet. // said, use unordered_map for MSVC 2010 and beyond is our safest bet.
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# if _MSC_VER >= 1600 // Since Visual Studio 2010 # if _MSC_VER >= 1900 // Since Visual Studio 2019
# define GOOGLE_PROTOBUF_HASH_NAMESPACE std
# include <unordered_map>
# define GOOGLE_PROTOBUF_HASH_MAP_CLASS unordered_map
# include <unordered_set>
# define GOOGLE_PROTOBUF_HASH_SET_CLASS unordered_set
# elif _MSC_VER >= 1600 // Since Visual Studio 2010
# define GOOGLE_PROTOBUF_HAS_CXX11_HASH # define GOOGLE_PROTOBUF_HAS_CXX11_HASH
# define GOOGLE_PROTOBUF_HASH_COMPARE std::hash_compare # define GOOGLE_PROTOBUF_HASH_COMPARE std::hash_compare
# elif _MSC_VER >= 1500 // Since Visual Studio 2008 # elif _MSC_VER >= 1500 // Since Visual Studio 2008
@ -233,7 +240,7 @@ namespace google {
HashFcn hash_function() const { return HashFcn(); } HashFcn hash_function() const { return HashFcn(); }
}; };
#elif defined(_MSC_VER) && !defined(_STLPORT_VERSION) #elif defined(_MSC_VER) && _MSC_VER < 1900 && !defined(_STLPORT_VERSION)
template <typename Key> template <typename Key>
struct hash : public GOOGLE_PROTOBUF_HASH_COMPARE<Key> { struct hash : public GOOGLE_PROTOBUF_HASH_COMPARE<Key> {