Index: boost/smart_ptr/shared_ptr.hpp
===================================================================
--- boost/smart_ptr/shared_ptr.hpp	(revision 60287)
+++ boost/smart_ptr/shared_ptr.hpp	(working copy)
@@ -342,7 +342,7 @@
 
 // Move support
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     shared_ptr( shared_ptr && r ): px( r.px ), pn() // never throws
     {
Index: boost/smart_ptr/detail/shared_count.hpp
===================================================================
--- boost/smart_ptr/detail/shared_count.hpp	(revision 60287)
+++ boost/smart_ptr/detail/shared_count.hpp	(working copy)
@@ -228,7 +228,7 @@
         if( pi_ != 0 ) pi_->add_ref_copy();
     }
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     shared_count(shared_count && r): pi_(r.pi_) // nothrow
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
@@ -335,7 +335,7 @@
 
 // Move support
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     weak_count(weak_count && r): pi_(r.pi_) // nothrow
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
Index: boost/smart_ptr/weak_ptr.hpp
===================================================================
--- boost/smart_ptr/weak_ptr.hpp	(revision 60287)
+++ boost/smart_ptr/weak_ptr.hpp	(working copy)
@@ -74,7 +74,7 @@
     {
     }
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     template<class Y>
 #if !defined( BOOST_SP_NO_SP_CONVERTIBLE )
@@ -131,7 +131,7 @@
         return *this;
     }
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     template<class Y>
     weak_ptr & operator=( weak_ptr<Y> && r )
Index: boost/smart_ptr/intrusive_ptr.hpp
===================================================================
--- boost/smart_ptr/intrusive_ptr.hpp	(revision 60287)
+++ boost/smart_ptr/intrusive_ptr.hpp	(working copy)
@@ -113,7 +113,7 @@
 
 // Move support
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
     intrusive_ptr(intrusive_ptr && rhs): px( rhs.px )
     {
Index: boost/smart_ptr/make_shared.hpp
===================================================================
--- boost/smart_ptr/make_shared.hpp	(revision 60287)
+++ boost/smart_ptr/make_shared.hpp	(working copy)
@@ -86,7 +86,7 @@
     }
 };
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 template< class T > T&& forward( T &&t )
 {
     return t;
@@ -133,7 +133,7 @@
     return boost::shared_ptr< T >( pt, pt2 );
 }
 
-#if defined( BOOST_HAS_VARIADIC_TMPL ) && defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
 
 // Variadic templates, rvalue reference
 
Index: libs/smart_ptr/test/intrusive_ptr_move_test.cpp
===================================================================
--- libs/smart_ptr/test/intrusive_ptr_move_test.cpp	(revision 60287)
+++ libs/smart_ptr/test/intrusive_ptr_move_test.cpp	(working copy)
@@ -33,7 +33,7 @@
 #include <algorithm>
 #include <functional>
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
 namespace N
 {
@@ -174,7 +174,7 @@
     return boost::report_errors();
 }
 
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined(BOOST_NO_RVALUE_REFERENCES)
 
 int main()
 {
Index: libs/smart_ptr/test/shared_ptr_move_test.cpp
===================================================================
--- libs/smart_ptr/test/shared_ptr_move_test.cpp	(revision 60287)
+++ libs/smart_ptr/test/shared_ptr_move_test.cpp	(working copy)
@@ -11,7 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
 struct X
 {
@@ -96,7 +96,7 @@
     return boost::report_errors();
 }
 
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined(BOOST_NO_RVALUE_REFERENCES)
 
 int main()
 {
Index: libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp
===================================================================
--- libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp	(revision 60287)
+++ libs/smart_ptr/test/make_shared_perfect_forwarding_test.cpp	(working copy)
@@ -12,14 +12,14 @@
 #include <boost/make_shared.hpp>
 #include <boost/shared_ptr.hpp>
 
-#ifndef BOOST_HAS_RVALUE_REFS
+#ifdef BOOST_NO_RVALUE_REFERENCES
 
 int main()
 {
     return 0;
 }
 
-#else // BOOST_HAS_RVALUE_REFS
+#else // BOOST_NO_RVALUE_REFERENCES
 
 class myarg
 {
@@ -95,4 +95,4 @@
     return boost::report_errors();
 }
 
-#endif // BOOST_HAS_RVALUE_REFS
+#endif // BOOST_NO_RVALUE_REFERENCES
Index: libs/smart_ptr/test/weak_ptr_move_test.cpp
===================================================================
--- libs/smart_ptr/test/weak_ptr_move_test.cpp	(revision 60287)
+++ libs/smart_ptr/test/weak_ptr_move_test.cpp	(working copy)
@@ -11,7 +11,7 @@
 #include <boost/weak_ptr.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
-#if defined( BOOST_HAS_RVALUE_REFS )
+#if !defined(BOOST_NO_RVALUE_REFERENCES)
 
 struct X
 {
@@ -111,7 +111,7 @@
     return boost::report_errors();
 }
 
-#else // !defined( BOOST_HAS_RVALUE_REFS )
+#else // defined(BOOST_NO_RVALUE_REFERENCES)
 
 int main()
 {