[Boost-commit] svn:boost r82054 - in branches/release: boost/function libs/function/test

Subject: [Boost-commit] svn:boost r82054 - in branches/release: boost/function libs/function/test
From: marshall_at_[hidden]
Date: 2012-12-17 12:50:39

Author: marshall
Date: 2012-12-17 12:50:38 EST (Mon, 17 Dec 2012)
New Revision: 82054
URL: http://svn.boost.org/trac/boost/changeset/82054

Log:
Merge macro changes for Boost.Function to release branch
Properties modified: 
   branches/release/boost/function/function_template.hpp   (contents, props changed)
   branches/release/libs/function/test/function_test.cpp   (contents, props changed)
Text files modified: 
   branches/release/boost/function/function_template.hpp |    10 +++++-----                              
   branches/release/libs/function/test/function_test.cpp |     2 +-                                      
   2 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/release/boost/function/function_template.hpp
==============================================================================
--- branches/release/boost/function/function_template.hpp	(original)
+++ branches/release/boost/function/function_template.hpp	2012-12-17 12:50:38 EST (Mon, 17 Dec 2012)
@@ -749,7 +749,7 @@
       this->assign_to_own(f);
     }
     
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     BOOST_FUNCTION_FUNCTION(BOOST_FUNCTION_FUNCTION&& f) : function_base()
     {
       this->move_assign(f);
@@ -838,7 +838,7 @@
       return *this;
     }
     
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     // Move assignment from another BOOST_FUNCTION_FUNCTION
     BOOST_FUNCTION_FUNCTION& operator=(BOOST_FUNCTION_FUNCTION&& f)
     {
@@ -1090,7 +1090,7 @@
 
   function(const base_type& f) : base_type(static_cast<const base_type&>(f)){}
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   // Move constructors
   function(self_type&& f): base_type(static_cast<base_type&&>(f)){}
   function(base_type&& f): base_type(static_cast<base_type&&>(f)){}
@@ -1102,7 +1102,7 @@
     return *this;
   }
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(self_type&& f)
   {
     self_type(static_cast<self_type&&>(f)).swap(*this);
@@ -1139,7 +1139,7 @@
     return *this;
   }
   
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   self_type& operator=(base_type&& f)
   {
     self_type(static_cast<base_type&&>(f)).swap(*this);

Modified: branches/release/libs/function/test/function_test.cpp
==============================================================================
--- branches/release/libs/function/test/function_test.cpp	(original)
+++ branches/release/libs/function/test/function_test.cpp	2012-12-17 12:50:38 EST (Mon, 17 Dec 2012)
@@ -733,7 +733,7 @@
   BOOST_CHECK(!f1.empty());
   BOOST_CHECK(global_int == 1);
   
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
   // Testing rvalue constructors
   f1_type f2(static_cast<f1_type&&>(f1));
   BOOST_CHECK(f1.empty());