[Boost-commit] svn:boost r86771 - trunk/boost/thread/csbl

Subject: [Boost-commit] svn:boost r86771 - trunk/boost/thread/csbl
From: vicente.botet_at_[hidden]
Date: 2013-11-19 16:58:59

Author: viboes
Date: 2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)
New Revision: 86771
URL: http://svn.boost.org/trac/boost/changeset/86771

Log:
Thread: Allows to force the use of boost libraries on csbl.

Text files modified: 
   trunk/boost/thread/csbl/deque.hpp      |     7 +++++--                                 
   trunk/boost/thread/csbl/functional.hpp |     7 +++++--                                 
   trunk/boost/thread/csbl/list.hpp       |     7 +++++--                                 
   trunk/boost/thread/csbl/tuple.hpp      |     8 ++++++--                                
   trunk/boost/thread/csbl/vector.hpp     |     7 +++++--                                 
   5 files changed, 26 insertions(+), 10 deletions(-)

Modified: trunk/boost/thread/csbl/deque.hpp
==============================================================================
--- trunk/boost/thread/csbl/deque.hpp	Tue Nov 19 16:58:34 2013	(r86770)
+++ trunk/boost/thread/csbl/deque.hpp	2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)	(r86771)
@@ -11,7 +11,10 @@
 
 #include <boost/config.hpp>
 
-#if defined BOOST_NO_CXX11_HDR_DEQUE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_DEQUE || defined BOOST_NO_CXX11_HDR_DEQUE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef BOOST_THREAD_USES_BOOST_DEQUE
+#define BOOST_THREAD_USES_BOOST_DEQUE
+#endif
 #include <boost/container/deque.hpp>
 #else
 #include <deque>
@@ -21,7 +24,7 @@
 {
   namespace csbl
   {
-#if defined BOOST_NO_CXX11_HDR_DEQUE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_DEQUE
     using ::boost::container::deque;
 
 #else

Modified: trunk/boost/thread/csbl/functional.hpp
==============================================================================
--- trunk/boost/thread/csbl/functional.hpp	Tue Nov 19 16:58:34 2013	(r86770)
+++ trunk/boost/thread/csbl/functional.hpp	2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)	(r86771)
@@ -13,7 +13,10 @@
 
 #include <functional>
 
-#if defined BOOST_NO_CXX11_HDR_FUNCTIONAL || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_FUNCTIONAL || defined BOOST_NO_CXX11_HDR_FUNCTIONAL || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef BOOST_THREAD_USES_BOOST_FUNCTIONAL
+#define BOOST_THREAD_USES_BOOST_FUNCTIONAL
+#endif
 #include <boost/function.hpp>
 #endif
 
@@ -21,7 +24,7 @@
 {
   namespace csbl
   {
-#if defined BOOST_NO_CXX11_HDR_FUNCTIONAL || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_FUNCTIONAL
     using ::boost::function;
 #else
     // D.8.1, base (deprecated):

Modified: trunk/boost/thread/csbl/list.hpp
==============================================================================
--- trunk/boost/thread/csbl/list.hpp	Tue Nov 19 16:58:34 2013	(r86770)
+++ trunk/boost/thread/csbl/list.hpp	2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)	(r86771)
@@ -11,7 +11,10 @@
 
 #include <boost/config.hpp>
 
-#if defined BOOST_NO_CXX11_HDR_LIST || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_LIST || defined BOOST_NO_CXX11_HDR_LIST || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef BOOST_THREAD_USES_BOOST_LIST
+#define BOOST_THREAD_USES_BOOST_LIST
+#endif
 #include <boost/container/list.hpp>
 #else
 #include <list>
@@ -21,7 +24,7 @@
 {
   namespace csbl
   {
-#if defined BOOST_NO_CXX11_HDR_LIST || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_LIST
     using ::boost::container::list;
 #else
     using ::std::list;

Modified: trunk/boost/thread/csbl/tuple.hpp
==============================================================================
--- trunk/boost/thread/csbl/tuple.hpp	Tue Nov 19 16:58:34 2013	(r86770)
+++ trunk/boost/thread/csbl/tuple.hpp	2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)	(r86771)
@@ -11,8 +11,12 @@
 
 #include <boost/config.hpp>
 
-#if defined BOOST_NO_CXX11_HDR_TUPLE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_TUPLE || defined BOOST_NO_CXX11_HDR_TUPLE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
 #include <boost/tuple/tuple.hpp>
+#ifndef BOOST_THREAD_USES_BOOST_TUPLE
+#define BOOST_THREAD_USES_BOOST_TUPLE
+#endif
+
 #else
 #include <tuple>
 #endif
@@ -21,7 +25,7 @@
 {
   namespace csbl
   {
-#if defined BOOST_NO_CXX11_HDR_TUPLE || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_TUPLE
     using ::boost::tuple;
 #else
     // 20.4.2, class template tuple:

Modified: trunk/boost/thread/csbl/vector.hpp
==============================================================================
--- trunk/boost/thread/csbl/vector.hpp	Tue Nov 19 16:58:34 2013	(r86770)
+++ trunk/boost/thread/csbl/vector.hpp	2013-11-19 16:58:59 EST (Tue, 19 Nov 2013)	(r86771)
@@ -11,7 +11,10 @@
 
 #include <boost/config.hpp>
 
-#if defined BOOST_NO_CXX11_HDR_VECTOR || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_VECTOR || defined BOOST_NO_CXX11_HDR_VECTOR || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#ifndef BOOST_THREAD_USES_BOOST_VECTOR
+#define BOOST_THREAD_USES_BOOST_VECTOR
+#endif
 #include <boost/container/vector.hpp>
 #else
 #include <vector>
@@ -21,7 +24,7 @@
 {
   namespace csbl
   {
-#if defined BOOST_NO_CXX11_HDR_VECTOR || defined BOOST_NO_CXX11_RVALUE_REFERENCES
+#if defined BOOST_THREAD_USES_BOOST_VECTOR
     using ::boost::container::vector;
 #else
     using ::std::vector;