From 25bb75e3f826754f3d250bff1d6deeb4aab0911b Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Thu, 12 Jun 2014 01:18:20 +0900 Subject: [PATCH] Fix test error in msvc-10.0 Including fusion/adapted/std_tuple.hpp will occur compile error. Therefore, entire test should be ignored. Signed-off-by: Kohei Takahashi --- test/sequence/std_tuple.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/sequence/std_tuple.cpp b/test/sequence/std_tuple.cpp index 3ac6e387..2495fa55 100644 --- a/test/sequence/std_tuple.cpp +++ b/test/sequence/std_tuple.cpp @@ -7,7 +7,9 @@ #include -#if !defined(BOOST_NO_CXX11_HDR_TUPLE) +// adapted/std_tuple.hpp only supports implementations using variadic templates +#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \ + !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #include #include @@ -23,15 +25,12 @@ main() using namespace boost::fusion; using namespace boost; -// The convert only supports implementations using variadic templates -#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) { // conversion vector to std tuple std::tuple t = convert(make_vector(123, "Hola!!!")); BOOST_TEST(std::get<0>(t) == 123); BOOST_TEST(std::get<1>(t) == "Hola!!!"); } -#endif return boost::report_errors(); }