Skip to content

Commit 2c832ff

Browse files
authored
Merge pull request #1007 from redboltz/temp_fix_1005
Remove chrono support on MSGPACK_NO_BOOST.
2 parents 34e4114 + e596b6f commit 2c832ff

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

include/msgpack/type.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,11 @@
3636
#include "adaptor/cpp11/array.hpp"
3737
#include "adaptor/cpp11/array_char.hpp"
3838
#include "adaptor/cpp11/array_unsigned_char.hpp"
39+
40+
#if !defined(MSGPACK_NO_BOOST)
3941
#include "adaptor/cpp11/chrono.hpp"
42+
#endif // !defined(MSGPACK_NO_BOOST)
43+
4044
#include "adaptor/cpp11/forward_list.hpp"
4145
#include "adaptor/cpp11/reference_wrapper.hpp"
4246
#include "adaptor/cpp11/shared_ptr.hpp"

test/msgpack_cpp11.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,8 @@ BOOST_AUTO_TEST_CASE(no_def_con_array_simple_buffer)
861861
BOOST_CHECK(val1 == val2);
862862
}
863863

864+
#if !defined(MSGPACK_NO_BOOST)
865+
864866
BOOST_AUTO_TEST_CASE(system_clock)
865867
{
866868
std::chrono::system_clock::time_point val1;
@@ -1426,6 +1428,8 @@ BOOST_AUTO_TEST_CASE(high_resolution_clock_impl_now)
14261428
BOOST_CHECK(val1 == val3);
14271429
}
14281430

1431+
#endif // !defined(MSGPACK_NO_BOOST)
1432+
14291433

14301434
BOOST_AUTO_TEST_CASE(timespec_pack_convert_zero)
14311435
{

test/object_with_zone.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -917,6 +917,8 @@ BOOST_AUTO_TEST_CASE(tuple_empty)
917917
BOOST_CHECK(obj.as<test_t>() == v);
918918
}
919919

920+
#if !defined(MSGPACK_NO_BOOST)
921+
920922
BOOST_AUTO_TEST_CASE(system_clock)
921923
{
922924
std::chrono::system_clock::time_point v;
@@ -981,6 +983,8 @@ BOOST_AUTO_TEST_CASE(system_clock_impl_max)
981983
BOOST_CHECK(obj.as<std::chrono::system_clock::time_point>() == v);
982984
}
983985

986+
#endif // !defined(MSGPACK_NO_BOOST)
987+
984988
#endif // !defined(MSGPACK_USE_CPP03)
985989

986990
BOOST_AUTO_TEST_CASE(ext_empty)

0 commit comments

Comments
 (0)