From 636a0130ba4186b5f839edafa8988a3c3a5999b6 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 6 Aug 2024 11:21:55 +0900 Subject: [PATCH] Conditional include msgpack::variant. It uses boost::variant. boost::variant requires boost::tyoe_index. boost::type index has dropped C++03 support. --- include/msgpack/type.hpp | 4 ++++ test/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/msgpack/type.hpp b/include/msgpack/type.hpp index 1ab49745..9ef3e86d 100644 --- a/include/msgpack/type.hpp +++ b/include/msgpack/type.hpp @@ -73,7 +73,11 @@ #if !defined(MSGPACK_NO_BOOST) #include "adaptor/boost/fusion.hpp" + +#if !defined(MSGPACK_USE_CPP03) #include "adaptor/boost/msgpack_variant.hpp" +#endif // !defined(MSGPACK_USE_CPP03) + #include "adaptor/boost/optional.hpp" #include "adaptor/boost/string_ref.hpp" #include "adaptor/boost/string_view.hpp" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index a0233dd3..b29c07a2 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -8,7 +8,6 @@ LIST (APPEND check_PROGRAMS boost_optional.cpp boost_string_ref.cpp boost_string_view.cpp - boost_variant.cpp buffer.cpp carray.cpp cases.cpp @@ -43,6 +42,7 @@ ENDIF () IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17 OR MSGPACK_CXX20) LIST (APPEND check_PROGRAMS + boost_variant.cpp iterator_cpp11.cpp msgpack_cpp11.cpp reference_cpp11.cpp