Skip to content

Commit 4af6d4d

Browse files
committed
Merge pull request #283 from redboltz/add_l_suffix
Replaced 201103 with 201103L.
2 parents 432c9cc + e37f14f commit 4af6d4d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

include/msgpack/cpp_config.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
// If MSVC would support C++11 completely,
2525
// then 'defined(_MSC_VER)' would replace with
2626
// '_MSC_VER < XXXX'
27-
# if (__cplusplus < 201103) || defined(_MSC_VER)
27+
# if (__cplusplus < 201103L) || defined(_MSC_VER)
2828
# define MSGPACK_USE_CPP03
2929
# endif
3030
#endif // MSGPACK_USE_CPP03
3131

3232

3333

3434
#if defined __cplusplus
35-
#if __cplusplus < 201103
35+
#if __cplusplus < 201103L
3636

3737
#if !defined(nullptr)
38-
# if _MSC_VER < 1600
38+
# if _MSC_VER < 1600
3939
# define nullptr (0)
4040
# endif
4141
#endif
@@ -84,7 +84,7 @@ struct enable_if<false, T> {
8484
} // namespace msgpack
8585

8686

87-
#else // __cplusplus < 201103
87+
#else // __cplusplus < 201103L
8888

8989
#include <memory>
9090
#include <tuple>
@@ -110,7 +110,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
110110
} // namespace msgpack
111111

112112

113-
#endif // __cplusplus < 201103
113+
#endif // __cplusplus < 201103L
114114

115115
#endif // __cplusplus
116116

include/msgpack/versioning.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@
6262

6363
#define MSGPACK_PP_IS_NS_ENABLED(ns) MSGPACK_PP_CHECK(MSGPACK_PP_NS_ENABLED_PROBE(ns))
6464

65-
#if __cplusplus < 201103
65+
#if __cplusplus < 201103L
6666
#define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
6767
(namespace ns{}; using namespace ns; namespace ns, \
6868
namespace ns)
6969

70-
#else // __cplusplus < 201103
70+
#else // __cplusplus < 201103L
7171

7272
#define MSGPACK_API_VERSION_NAMESPACE(ns) MSGPACK_PP_IIF(MSGPACK_PP_IS_NS_ENABLED(ns)) \
7373
(inline namespace ns, namespace ns)
7474

75-
#endif // __cplusplus < 201103
75+
#endif // __cplusplus < 201103L
7676

7777
#endif // MSGPACK_VERSIONING_HPP

test/msgpack_tuple.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ TEST(msgpack_tuple, non_member_get)
3030
EXPECT_EQ("DEFG", msgpack::type::get<2>(t1));
3131
}
3232

33-
#if __cplusplus >= 201103
33+
#if __cplusplus >= 201103L
3434
TEST(msgpack_tuple, std_non_member_get)
3535
{
3636
msgpack::type::tuple<int, bool, std::string> t1(42, true, "ABC");

0 commit comments

Comments
 (0)