Supported VC++. Fixed testing macro for tr1 containers.

This commit is contained in:
Takatoshi Kondo
2014-02-27 23:45:34 +00:00
parent 2360466aa9
commit b8076fa71f
3 changed files with 143 additions and 12 deletions

View File

@@ -20,17 +20,24 @@
#include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION)
#if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#define MSGPACK_HAS_STD_UNOURDERED_MAP
#include <unordered_map>
#define MSGPACK_STD_TR1 std
#else // _LIBCPP_VERSION
#else // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#if __GNUC__ >= 4
#define MSGPACK_HAS_STD_TR1_UNOURDERED_MAP
#include <tr1/unordered_map>
#define MSGPACK_STD_TR1 std::tr1
#endif // _LIBCPP_VERSION
#endif // __GNUC__ >= 4
#endif // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
namespace msgpack {

View File

@@ -20,17 +20,24 @@
#include "msgpack/object.hpp"
#if defined(_LIBCPP_VERSION)
#if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#define MSGPACK_HAS_STD_UNOURDERED_SET
#include <unordered_set>
#define MSGPACK_STD_TR1 std
#else // _LIBCPP_VERSION
#else // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
#if __GNUC__ >= 4
#define MSGPACK_HAS_STD_TR1_UNOURDERED_SET
#include <tr1/unordered_set>
#define MSGPACK_STD_TR1 std::tr1
#endif // _LIBCPP_VERSION
#endif // __GNUC__ >= 4
#endif // defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
namespace msgpack {