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

Merge pull request #283 from redboltz/add_l_suffix

Browse Source 
Replaced 201103 with 201103L.
This commit is contained in:
Nobuyuki Kubota 2015-05-25 11:32:28 -07:00
commit 4af6d4ddc8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/msgpack/cpp_config.hpp
View File

@ -24,7 +24,7 @@
// If MSVC would support C++11 completely, // If MSVC would support C++11 completely,
// then 'defined(_MSC_VER)' would replace with // then 'defined(_MSC_VER)' would replace with
// '_MSC_VER < XXXX' // '_MSC_VER < XXXX'
# if (__cplusplus < 201103) || defined(_MSC_VER) # if (__cplusplus < 201103L) || defined(_MSC_VER)
# define MSGPACK_USE_CPP03 # define MSGPACK_USE_CPP03
# endif # endif
#endif // MSGPACK_USE_CPP03 #endif // MSGPACK_USE_CPP03
@ -32,10 +32,10 @@
#if defined __cplusplus #if defined __cplusplus
#if __cplusplus < 201103 #if __cplusplus < 201103L
#if !defined(nullptr) #if !defined(nullptr)
# if _MSC_VER < 1600 # if _MSC_VER < 1600
# define nullptr (0) # define nullptr (0)
# endif # endif
#endif #endif
@ -84,7 +84,7 @@ struct enable_if<false, T> {
} // namespace msgpack } // namespace msgpack
#else // __cplusplus < 201103 #else // __cplusplus < 201103L
#include <memory> #include <memory>
#include <tuple> #include <tuple>
@ -110,7 +110,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
} // namespace msgpack } // namespace msgpack
#endif // __cplusplus < 201103 #endif // __cplusplus < 201103L
#endif // __cplusplus #endif // __cplusplus

6
include/msgpack/versioning.hpp
View File

@ -62,16 +62,16 @@
#define MSGPACK_PP_IS_NS_ENABLED(ns) MSGPACK_PP_CHECK(MSGPACK_PP_NS_ENABLED_PROBE(ns)) #define MSGPACK_PP_IS_NS_ENABLED(ns) MSGPACK_PP_CHECK(MSGPACK_PP_NS_ENABLED_PROBE(ns))
#if __cplusplus < 201103 #if __cplusplus < 201103L
#define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \ #define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
(namespace ns{}; using namespace ns; namespace ns, \ (namespace ns{}; using namespace ns; namespace ns, \
namespace ns) namespace ns)
#else // __cplusplus < 201103 #else // __cplusplus < 201103L
#define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \ #define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
(inline namespace ns, namespace ns) (inline namespace ns, namespace ns)
#endif // __cplusplus < 201103 #endif // __cplusplus < 201103L
#endif // MSGPACK_VERSIONING_HPP #endif // MSGPACK_VERSIONING_HPP

2
test/msgpack_tuple.cpp
View File

@ -30,7 +30,7 @@ TEST(msgpack_tuple, non_member_get)
EXPECT_EQ("DEFG", msgpack::type::get<2>(t1)); EXPECT_EQ("DEFG", msgpack::type::get<2>(t1));
} }
#if __cplusplus >= 201103 #if __cplusplus >= 201103L
TEST(msgpack_tuple, std_non_member_get) TEST(msgpack_tuple, std_non_member_get)
{ {
msgpack::type::tuple<int, bool, std::string> t1(42, true, "ABC"); msgpack::type::tuple<int, bool, std::string> t1(42, true, "ABC");