From a856857cb78ed53a430dfae8b0670e395c7a6a10 Mon Sep 17 00:00:00 2001 From: Joel de Guzman Date: Tue, 4 Sep 2012 13:42:14 +0000 Subject: [PATCH] - Fixed code to allow decltype implementation of boost::result_of with BOOST_RESULT_OF_USE_DECLTYPE defined. - Reverted sequence/iterator.hpp to original version. [SVN r80396] --- test/Jamfile | 1 + test/sequence/iterator.hpp | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index b372d6b2..c7beba84 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -12,6 +12,7 @@ project : requirements gcc:-std=c++0x darwin:-std=c++0x + gcc:-DBOOST_RESULT_OF_USE_DECLTYPE ; { diff --git a/test/sequence/iterator.hpp b/test/sequence/iterator.hpp index c5364cb8..ab29b8a0 100644 --- a/test/sequence/iterator.hpp +++ b/test/sequence/iterator.hpp @@ -29,11 +29,7 @@ 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); @@ -65,12 +61,7 @@ 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); @@ -113,11 +104,7 @@ 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);