generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-24 06:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130 from jpetso/master

Browse Source 
Support std::unordered_map/set even if using libstdc++ from GCC.
This commit is contained in:
Takatoshi Kondo 2014-09-20 00:06:51 +09:00
commit 7ce69a362f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/msgpack/type/tr1/unordered_map.hpp
View File

@ -20,13 +20,16 @@
#include "msgpack/object.hpp" #include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #define LIBSTDCXX_HAS_STD_UNORDERED_MAP defined(__GLIBCXX__) && __GLIBCXX__ >= 20090421 \
&& (__cplusplus >= 201103L || __GXX_EXPERIMENTAL_CXX0X__)
#if LIBSTDCXX_HAS_STD_UNORDERED_MAP || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#define MSGPACK_HAS_STD_UNOURDERED_MAP #define MSGPACK_HAS_STD_UNOURDERED_MAP
#include <unordered_map> #include <unordered_map>
#define MSGPACK_STD_TR1 std #define MSGPACK_STD_TR1 std
#else // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #else // LIBSTDCXX_HAS_STD_UNORDERED_MAP || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#if __GNUC__ >= 4 #if __GNUC__ >= 4
@ -37,8 +40,7 @@
#endif // __GNUC__ >= 4 #endif // __GNUC__ >= 4
#endif // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #endif // LIBSTDCXX_HAS_STD_UNORDERED_MAP || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
namespace msgpack { namespace msgpack {

9
src/msgpack/type/tr1/unordered_set.hpp
View File

@ -20,13 +20,16 @@
#include "msgpack/object.hpp" #include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #define LIBSTDCXX_HAS_STD_UNORDERED_SET defined(__GLIBCXX__) && __GLIBCXX__ >= 20090421 \
&& (__cplusplus >= 201103L || __GXX_EXPERIMENTAL_CXX0X__)
#if LIBSTDCXX_HAS_STD_UNORDERED_SET || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#define MSGPACK_HAS_STD_UNOURDERED_SET #define MSGPACK_HAS_STD_UNOURDERED_SET
#include <unordered_set> #include <unordered_set>
#define MSGPACK_STD_TR1 std #define MSGPACK_STD_TR1 std
#else // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #else // LIBSTDCXX_HAS_STD_UNORDERED_SET || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#if __GNUC__ >= 4 #if __GNUC__ >= 4
@ -37,7 +40,7 @@
#endif // __GNUC__ >= 4 #endif // __GNUC__ >= 4
#endif // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700) #endif // LIBSTDCXX_HAS_STD_UNORDERED_SET || defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
namespace msgpack { namespace msgpack {