[Boost-commit] svn:boost r86215 - in trunk: boost/thread/detail libs/thread/src/pthread libs/thread/src/win32 libs/thread/test

Subject: [Boost-commit] svn:boost r86215 - in trunk: boost/thread/detail libs/thread/src/pthread libs/thread/src/win32 libs/thread/test
From: tim_at_[hidden]
Date: 2013-10-09 11:24:59

Author: timblechmann
Date: 2013-10-09 11:24:58 EDT (Wed, 09 Oct 2013)
New Revision: 86215
URL: http://svn.boost.org/trac/boost/changeset/86215

Log:
Revert "Thread: provide physical concurrency conditional until it no regression is introduced."

This reverts commit 271ba281aecd5c556b2b863a9f05a8066e717854.

Text files modified: 
   trunk/boost/thread/detail/thread.hpp     |     2 --                                      
   trunk/libs/thread/src/pthread/thread.cpp |     4 ----                                    
   trunk/libs/thread/src/win32/thread.cpp   |     2 --                                      
   trunk/libs/thread/test/Jamfile.v2        |     2 +-                                      
   4 files changed, 1 insertions(+), 9 deletions(-)

Modified: trunk/boost/thread/detail/thread.hpp
==============================================================================
--- trunk/boost/thread/detail/thread.hpp	Wed Oct  9 10:54:36 2013	(r86214)
+++ trunk/boost/thread/detail/thread.hpp	2013-10-09 11:24:58 EDT (Wed, 09 Oct 2013)	(r86215)
@@ -546,9 +546,7 @@
         void detach();
 
         static unsigned hardware_concurrency() BOOST_NOEXCEPT;
-#ifdef BOOST_THREAD_PROVIDES_PHYSICAL_CONCURRENCY
         static unsigned physical_concurrency() BOOST_NOEXCEPT;
-#endif
 
 #define BOOST_THREAD_DEFINES_THREAD_NATIVE_HANDLE
         typedef detail::thread_data_base::native_handle_type native_handle_type;

Modified: trunk/libs/thread/src/pthread/thread.cpp
==============================================================================
--- trunk/libs/thread/src/pthread/thread.cpp	Wed Oct  9 10:54:36 2013	(r86214)
+++ trunk/libs/thread/src/pthread/thread.cpp	2013-10-09 11:24:58 EDT (Wed, 09 Oct 2013)	(r86215)
@@ -27,7 +27,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef BOOST_THREAD_PROVIDES_PHYSICAL_CONCURRENCY
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/lexical_cast.hpp>
@@ -36,7 +35,6 @@
 #include <string>
 #include <set>
 #include <vector>
-#endif
 
 #include "./timeconv.inl"
 
@@ -554,7 +552,6 @@
 #endif
     }
 
-#ifdef BOOST_THREAD_PROVIDES_PHYSICAL_CONCURRENCY
     unsigned thread::physical_concurrency() BOOST_NOEXCEPT
     {
 #ifdef __linux__
@@ -604,7 +601,6 @@
         return hardware_concurrency();
 #endif
     }
-#endif
 
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
     void thread::interrupt()

Modified: trunk/libs/thread/src/win32/thread.cpp
==============================================================================
--- trunk/libs/thread/src/win32/thread.cpp	Wed Oct  9 10:54:36 2013	(r86214)
+++ trunk/libs/thread/src/win32/thread.cpp	2013-10-09 11:24:58 EDT (Wed, 09 Oct 2013)	(r86215)
@@ -417,7 +417,6 @@
         return info.dwNumberOfProcessors;
     }
 
-#ifdef BOOST_THREAD_PROVIDES_PHYSICAL_CONCURRENCY
     unsigned thread::physical_concurrency() BOOST_NOEXCEPT
     {
         unsigned cores = 0;
@@ -439,7 +438,6 @@
         }
         return cores;
     }
-#endif
 
     thread::native_handle_type thread::native_handle()
     {

Modified: trunk/libs/thread/test/Jamfile.v2
==============================================================================
--- trunk/libs/thread/test/Jamfile.v2	Wed Oct  9 10:54:36 2013	(r86214)
+++ trunk/libs/thread/test/Jamfile.v2	2013-10-09 11:24:58 EDT (Wed, 09 Oct 2013)	(r86215)
@@ -209,7 +209,7 @@
           [ thread-test test_thread.cpp ]
           [ thread-test test_thread_id.cpp ]
           [ thread-test test_hardware_concurrency.cpp ]
-          #[ thread-test test_physical_concurrency.cpp ]
+          [ thread-test test_physical_concurrency.cpp ]
           [ thread-test test_thread_move.cpp ]
           [ thread-test test_thread_return_local.cpp ]
           [ thread-test test_thread_move_return.cpp ]