Skip to content

Commit 7918c19

Browse files
committed
Merge branch 'jamessan-cxx11-32bit'
2 parents 4a94f83 + 0d7caec commit 7918c19

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

example/cpp11/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
IF (MSGPACK_CXX11)
1+
IF (MSGPACK_CXX11 OR MSGPACK_CXX17)
22
INCLUDE_DIRECTORIES (
33
../include
44
)

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ IF (MSGPACK_USE_X3_PARSE)
5555
)
5656
ENDIF ()
5757

58-
IF (MSGPACK_CXX11)
58+
IF (MSGPACK_CXX11 OR MSGPACK_CXX17)
5959
LIST (APPEND check_PROGRAMS
6060
iterator_cpp11.cpp
6161
msgpack_cpp11.cpp

test/msgpack_cpp11.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_zero)
10821082
TEST(MSGPACK_TIMESPEC, timespec_pack_convert_32bit_sec)
10831083
{
10841084
std::stringstream ss;
1085-
timespec val1{ 0xffffffffUL, 0 };
1085+
timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::is_signed ? INT32_MAX : UINT32_MAX, 0 };
10861086

10871087
msgpack::pack(ss, val1);
10881088
std::string const& str = ss.str();
@@ -1098,7 +1098,7 @@ TEST(MSGPACK_TIMESPEC, timespec_pack_convert_32bit_sec)
10981098
TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_32bit_sec)
10991099
{
11001100
msgpack::zone z;
1101-
timespec val1{ 0xffffffffUL, 0 };
1101+
timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::is_signed ? INT32_MAX : UINT32_MAX, 0 };
11021102
msgpack::object obj(val1, z);
11031103
timespec val2 = obj.as<timespec>();
11041104
EXPECT_EQ(val1.tv_sec, val2.tv_sec);
@@ -1188,6 +1188,7 @@ TEST(MSGPACK_TIMESPEC, timespec_object_with_zone_35bit_sec_max_nano)
11881188

11891189
TEST(MSGPACK_TIMESPEC, timespec_pack_convert_64bit_sec_max_nano)
11901190
{
1191+
if (sizeof(decltype(std::declval<timespec>().tv_sec)) <= 4) return;
11911192
std::stringstream ss;
11921193
timespec val1{ std::numeric_limits<decltype(std::declval<timespec>().tv_sec)>::max(), 999999999 };
11931194

0 commit comments

Comments
 (0)