Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80396 - in trunk/libs/fusion/test: . sequence
From: joel_at_[hidden]
Date: 2012-09-04 09:42:15


Author: djowel
Date: 2012-09-04 09:42:14 EDT (Tue, 04 Sep 2012)
New Revision: 80396
URL: http://svn.boost.org/trac/boost/changeset/80396

Log:
- Fixed code to allow decltype implementation of boost::result_of with BOOST_RESULT_OF_USE_DECLTYPE defined.
- Reverted sequence/iterator.hpp to original <correct-no-workaround> version.
Text files modified:
   trunk/libs/fusion/test/Jamfile | 1 +
   trunk/libs/fusion/test/sequence/iterator.hpp | 13 -------------
   2 files changed, 1 insertions(+), 13 deletions(-)

Modified: trunk/libs/fusion/test/Jamfile
==============================================================================
--- trunk/libs/fusion/test/Jamfile (original)
+++ trunk/libs/fusion/test/Jamfile 2012-09-04 09:42:14 EDT (Tue, 04 Sep 2012)
@@ -12,6 +12,7 @@
     : requirements
         <toolset>gcc:<cxxflags>-std=c++0x
         <toolset>darwin:<cxxflags>-std=c++0x
+ <toolset>gcc:<cxxflags>-DBOOST_RESULT_OF_USE_DECLTYPE
     ;
 
 {

Modified: trunk/libs/fusion/test/sequence/iterator.hpp
==============================================================================
--- trunk/libs/fusion/test/sequence/iterator.hpp (original)
+++ trunk/libs/fusion/test/sequence/iterator.hpp 2012-09-04 09:42:14 EDT (Tue, 04 Sep 2012)
@@ -29,11 +29,7 @@
 
         char const* s = "Hello";
         typedef FUSION_SEQUENCE<int, char, double, char const*> 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<seq_type>::type i(v);
 
         BOOST_TEST(*i == 1);
@@ -65,12 +61,7 @@
 
         char const* s = "Hello";
         typedef FUSION_SEQUENCE<int, char, double, char const*> 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<seq_type>::type i(t);
 
         BOOST_TEST(*i == 1);
@@ -113,11 +104,7 @@
 
         char const* s = "Hello";
         typedef FUSION_SEQUENCE<int, char, double, char 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<seq_type>::type i(t);
 
         BOOST_TEST(*i == 1);


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk