- 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.

[SVN r80396]
This commit is contained in:
Joel de Guzman
2012-09-04 13:42:14 +00:00
parent 78ff3d8831
commit a856857cb7
2 changed files with 1 additions and 13 deletions

View File

@ -12,6 +12,7 @@ project
: requirements : requirements
<toolset>gcc:<cxxflags>-std=c++0x <toolset>gcc:<cxxflags>-std=c++0x
<toolset>darwin:<cxxflags>-std=c++0x <toolset>darwin:<cxxflags>-std=c++0x
<toolset>gcc:<cxxflags>-DBOOST_RESULT_OF_USE_DECLTYPE
; ;
{ {

View File

@ -29,11 +29,7 @@ void test()
char const* s = "Hello"; char const* s = "Hello";
typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type; 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); seq_type v(1, 'x', 3.3, s);
#endif
boost::fusion::result_of::begin<seq_type>::type i(v); boost::fusion::result_of::begin<seq_type>::type i(v);
BOOST_TEST(*i == 1); BOOST_TEST(*i == 1);
@ -65,12 +61,7 @@ void test()
char const* s = "Hello"; char const* s = "Hello";
typedef FUSION_SEQUENCE<int, char, double, char const*> const seq_type; 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); seq_type t(1, 'x', 3.3, s);
#endif
boost::fusion::result_of::begin<seq_type>::type i(t); boost::fusion::result_of::begin<seq_type>::type i(t);
BOOST_TEST(*i == 1); BOOST_TEST(*i == 1);
@ -113,11 +104,7 @@ void test()
char const* s = "Hello"; char const* s = "Hello";
typedef FUSION_SEQUENCE<int, char, double, char const*> seq_type; 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); seq_type t(1, 'x', 3.3, s);
#endif
boost::fusion::result_of::begin<seq_type>::type i(t); boost::fusion::result_of::begin<seq_type>::type i(t);
BOOST_TEST(*i == 1); BOOST_TEST(*i == 1);