Fix testcase for MSVC 10.0.

MSVC 10.0/11.0 have <tuple> but don't compile variadic templates.
This commit is contained in:
Kohei Takahashi
2015-02-02 04:08:13 +09:00
parent 995202044c
commit b60219eb8a
2 changed files with 6 additions and 3 deletions

View File

@ -19,7 +19,8 @@
#include <boost/fusion/adapted/boost_array.hpp> #include <boost/fusion/adapted/boost_array.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/fusion/adapted/boost_tuple.hpp> #include <boost/fusion/adapted/boost_tuple.hpp>
#if !defined(BOOST_NO_CXX11_HDR_TUPLE) #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \
!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#include <tuple> #include <tuple>
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>
#endif #endif
@ -89,7 +90,8 @@ void test()
check<boost::tuples::tuple<int, int, int> >(); check<boost::tuples::tuple<int, int, int> >();
} }
#if !defined(BOOST_NO_CXX11_HDR_TUPLE) #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \
!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
{ {
check<std::tuple<> >(); check<std::tuple<> >();
check<std::tuple<int> >(); check<std::tuple<int> >();

View File

@ -8,7 +8,8 @@
// The std_tuple_iterator adaptor only supports implementations // The std_tuple_iterator adaptor only supports implementations
// using variadic templates // using variadic templates
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && \
!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#include <boost/fusion/adapted/std_tuple.hpp> #include <boost/fusion/adapted/std_tuple.hpp>