diff --git a/test/Jamfile b/test/Jamfile index 5d68124a..b372d6b2 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -8,6 +8,12 @@ # bring in rules for testing import testing ; +project + : requirements + gcc:-std=c++0x + darwin:-std=c++0x + ; + { test-suite fusion : diff --git a/test/sequence/construction.hpp b/test/sequence/construction.hpp index 380a9eed..57ba5301 100644 --- a/test/sequence/construction.hpp +++ b/test/sequence/construction.hpp @@ -57,7 +57,7 @@ test() FUSION_SEQUENCE<> empty0; -#ifndef TR1_TUPLE_TEST +#ifndef NO_CONSTRUCT_FROM_NIL FUSION_SEQUENCE<> empty1(empty); #endif diff --git a/test/sequence/iterator.hpp b/test/sequence/iterator.hpp index ab29b8a0..c5364cb8 100644 --- a/test/sequence/iterator.hpp +++ b/test/sequence/iterator.hpp @@ -29,7 +29,11 @@ void test() char const* s = "Hello"; typedef FUSION_SEQUENCE seq_type; +#if !defined(BOOST_NO_RVALUE_REFERENCES) + seq_type v(1, 'x', 3.3, std::move(s)); +#else seq_type v(1, 'x', 3.3, s); +#endif boost::fusion::result_of::begin::type i(v); BOOST_TEST(*i == 1); @@ -61,7 +65,12 @@ void test() char const* s = "Hello"; typedef FUSION_SEQUENCE const seq_type; +#if !defined(BOOST_NO_RVALUE_REFERENCES) + seq_type t(1, 'x', 3.3, std::move(s)); +#else seq_type t(1, 'x', 3.3, s); +#endif + boost::fusion::result_of::begin::type i(t); BOOST_TEST(*i == 1); @@ -104,7 +113,11 @@ void test() char const* s = "Hello"; typedef FUSION_SEQUENCE seq_type; +#if !defined(BOOST_NO_RVALUE_REFERENCES) + seq_type t(1, 'x', 3.3, std::move(s)); +#else seq_type t(1, 'x', 3.3, s); +#endif boost::fusion::result_of::begin::type i(t); BOOST_TEST(*i == 1); diff --git a/test/sequence/tuple_construction.cpp b/test/sequence/tuple_construction.cpp index b35233ab..044701c4 100644 --- a/test/sequence/tuple_construction.cpp +++ b/test/sequence/tuple_construction.cpp @@ -8,7 +8,7 @@ #include #include -#define TR1_TUPLE_TEST +#define NO_CONSTRUCT_FROM_NIL #define FUSION_SEQUENCE tuple #define FUSION_AT get #include "construction.hpp"