[Boost-commit] svn:boost r81855 - in branches/release: boost/utility libs/utility/test

Subject: [Boost-commit] svn:boost r81855 - in branches/release: boost/utility libs/utility/test
From: marshall_at_[hidden]
Date: 2012-12-11 11:41:54

Author: marshall
Date: 2012-12-11 11:41:54 EST (Tue, 11 Dec 2012)
New Revision: 81855
URL: http://svn.boost.org/trac/boost/changeset/81855

Log:
Merge deprecated macro change for Boost.Utility to release; no functionality change
Properties modified: 
   branches/release/boost/utility/result_of.hpp   (contents, props changed)
   branches/release/libs/utility/test/result_of_test.cpp   (contents, props changed)
Text files modified: 
   branches/release/boost/utility/result_of.hpp          |     2 +-                                      
   branches/release/libs/utility/test/result_of_test.cpp |     6 +++---                                  
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: branches/release/boost/utility/result_of.hpp
==============================================================================
--- branches/release/boost/utility/result_of.hpp	(original)
+++ branches/release/boost/utility/result_of.hpp	2012-12-11 11:41:54 EST (Tue, 11 Dec 2012)
@@ -46,7 +46,7 @@
 
 #ifndef BOOST_RESULT_OF_USE_TR1
 #  ifndef BOOST_RESULT_OF_USE_DECLTYPE
-#    ifndef BOOST_NO_DECLTYPE_N3276 // this implies !defined(BOOST_NO_DECLTYPE)
+#    ifndef BOOST_NO_CXX11_DECLTYPE_N3276 // this implies !defined(BOOST_NO_CXX11_DECLTYPE)
 #      define BOOST_RESULT_OF_USE_DECLTYPE
 #    else
 #      define BOOST_RESULT_OF_USE_TR1

Modified: branches/release/libs/utility/test/result_of_test.cpp
==============================================================================
--- branches/release/libs/utility/test/result_of_test.cpp	(original)
+++ branches/release/libs/utility/test/result_of_test.cpp	2012-12-11 11:41:54 EST (Tue, 11 Dec 2012)
@@ -104,7 +104,7 @@
   cv_overload_check<const int> operator()() const;
   cv_overload_check<volatile int> operator()() volatile;
   cv_overload_check<const volatile int> operator()() const volatile;
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
   short operator()(int&&);
   int operator()(int&);
   long operator()(int const&);
@@ -122,7 +122,7 @@
   cv_overload_check<const int> operator()() const;
   cv_overload_check<volatile int> operator()() volatile;
   cv_overload_check<const volatile int> operator()() const volatile;
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
   short operator()(int&&);
   int operator()(int&);
   long operator()(int const&);
@@ -291,7 +291,7 @@
   BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const int> >::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<volatile int> >::value));
   BOOST_STATIC_ASSERT((is_same<result_of<const volatile no_result_type_or_result_template<void>(void)>::type, cv_overload_check<const volatile int> >::value));
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&&)>::type, short>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int&)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result(int const&)>::type, long>::value));