From e6b8a133a8d6413f988a2e4c809293b290be9fa2 Mon Sep 17 00:00:00 2001
From: Marshall Clow <marshall@idio.com>
Date: Tue, 27 Nov 2012 17:26:10 +0000
Subject: [PATCH] Removed missed usage of deprecated macros in Boost.Thread

[SVN r81593]
---
 include/boost/thread/detail/config.hpp | 2 +-
 test/test_6174.cpp                     | 4 ++--
 test/test_futures.cpp                  | 2 +-
 test/test_ml.cpp                       | 2 +-
 test/test_move_function.cpp            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/thread/detail/config.hpp b/include/boost/thread/detail/config.hpp
index fd4f1a6f..130c69fe 100644
--- a/include/boost/thread/detail/config.hpp
+++ b/include/boost/thread/detail/config.hpp
@@ -18,7 +18,7 @@
 #include <boost/thread/detail/platform.hpp>
 
 #if ! defined BOOST_THREAD_NOEXCEPT_OR_THROW
-#ifdef BOOST_NO_NOEXCEPT
+#ifdef BOOST_NO_CXX11_NOEXCEPT
 #  define BOOST_THREAD_NOEXCEPT_OR_THROW throw()
 #else
 #  define BOOST_THREAD_NOEXCEPT_OR_THROW noexcept
diff --git a/test/test_6174.cpp b/test/test_6174.cpp
index 250764f9..4775c774 100644
--- a/test/test_6174.cpp
+++ b/test/test_6174.cpp
@@ -9,9 +9,9 @@
 #include <boost/thread.hpp>
 #include <boost/config.hpp>
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 struct MovableButNonCopyable {
-#if ! defined BOOST_NO_DELETED_FUNCTIONS
+#if ! defined BOOST_NO_CXX11_DELETED_FUNCTIONS
       MovableButNonCopyable(MovableButNonCopyable const&) = delete;
       MovableButNonCopyable& operator=(MovableButNonCopyable const&) = delete;
 #else
diff --git a/test/test_futures.cpp b/test/test_futures.cpp
index b368a410..7bf77b0e 100644
--- a/test/test_futures.cpp
+++ b/test/test_futures.cpp
@@ -20,7 +20,7 @@
 #define LOG \
   if (false) {} else std::cout << std::endl << __FILE__ << "[" << __LINE__ << "]"
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     template<typename T>
     typename boost::remove_reference<T>::type&& cast_to_rval(T&& t)
     {
diff --git a/test/test_ml.cpp b/test/test_ml.cpp
index 51268d3d..61b7eff5 100755
--- a/test/test_ml.cpp
+++ b/test/test_ml.cpp
@@ -4,7 +4,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/thread/future.hpp>
diff --git a/test/test_move_function.cpp b/test/test_move_function.cpp
index 7e8204cc..c2cefd6d 100644
--- a/test/test_move_function.cpp
+++ b/test/test_move_function.cpp
@@ -97,7 +97,7 @@ namespace user_test_ns
     struct nc:
         public boost::shared_ptr<int>
     {
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
         nc() {}
         nc(nc&&)
         {
@@ -120,7 +120,7 @@ namespace boost
 void test_move_for_user_defined_type_unaffected()
 {
     user_test_ns::nc src;
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     user_test_ns::nc dest=boost::move(src);
 #else
     user_test_ns::nc dest=move(src);