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 #383 from bpay/vs2015-cpp11

Browse Source 
Fix VS2015 still using C++03 API
This commit is contained in:
Takatoshi Kondo 2015-11-10 22:33:46 +09:00
commit 1a7aa5e5ec
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/msgpack/cpp_config.hpp
View File

@ -32,8 +32,7 @@
#if defined __cplusplus
#if __cplusplus < 201103L
#if defined(MSGPACK_USE_CPP03)
#if !defined(nullptr)
# if _MSC_VER < 1600
@ -101,7 +100,7 @@ struct is_same<T, T> : true_type {};
} // namespace msgpack
#else // __cplusplus < 201103L
#else // MSGPACK_USE_CPP03
#include <memory>
#include <tuple>
@ -128,8 +127,6 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
} // namespace msgpack
#endif // __cplusplus < 201103L
#endif // __cplusplus
#endif // MSGPACK_USE_CPP03
#endif /* msgpack/cpp_config.hpp */