[Boost-commit] svn:boost r41273 - in trunk/boost/thread: . detail

From: anthony_at_[hidden]
Date: 2007-11-21 05:44:23

Author: anthonyw
Date: 2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
New Revision: 41273
URL: http://svn.boost.org/trac/boost/changeset/41273

Log:
changed platform split to allow bjam to track includes and check dependencies
Text files modified: 
   trunk/boost/thread/condition_variable.hpp |     8 +++++++-                                
   trunk/boost/thread/detail/platform.hpp    |     9 ++++-----                               
   trunk/boost/thread/mutex.hpp              |     8 +++++++-                                
   trunk/boost/thread/once.hpp               |     8 +++++++-                                
   trunk/boost/thread/recursive_mutex.hpp    |     8 +++++++-                                
   trunk/boost/thread/shared_mutex.hpp       |     8 +++++++-                                
   trunk/boost/thread/thread.hpp             |     9 ++++++++-                               
   trunk/boost/thread/tss.hpp                |     8 +++++++-                                
   8 files changed, 54 insertions(+), 12 deletions(-)

Modified: trunk/boost/thread/condition_variable.hpp
==============================================================================
--- trunk/boost/thread/condition_variable.hpp	(original)
+++ trunk/boost/thread/condition_variable.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,6 +10,12 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(condition_variable.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/condition_variable.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/condition_variable.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: trunk/boost/thread/detail/platform.hpp
==============================================================================
--- trunk/boost/thread/detail/platform.hpp	(original)
+++ trunk/boost/thread/detail/platform.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -1,4 +1,5 @@
 // Copyright 2006 Roland Schwarz.
+// (C) Copyright 2007 Anthony Williams
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -56,17 +57,15 @@
 // available the preprocessor will fail with a diagnostic message.
  
 #if defined(BOOST_THREAD_POSIX)
-#  define BOOST_THREAD_PPFX pthread
+#  define BOOST_THREAD_PLATFORM_PTHREAD
 #else
 #  if defined(BOOST_THREAD_WIN32)
-#       define BOOST_THREAD_PPFX win32
+#       define BOOST_THREAD_PLATFORM_WIN32
 #  elif defined(BOOST_HAS_PTHREADS)
-#       define BOOST_THREAD_PPFX pthread
+#       define BOOST_THREAD_PLATFORM_PTHREAD
 #  else
 #       error "Sorry, no boost threads are available for this platform."
 #  endif
 #endif
 
-#define BOOST_THREAD_PLATFORM(header) <boost/thread/BOOST_THREAD_PPFX/header>
-
 #endif // BOOST_THREAD_RS06040501_HPP

Modified: trunk/boost/thread/mutex.hpp
==============================================================================
--- trunk/boost/thread/mutex.hpp	(original)
+++ trunk/boost/thread/mutex.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,6 +10,12 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: trunk/boost/thread/once.hpp
==============================================================================
--- trunk/boost/thread/once.hpp	(original)
+++ trunk/boost/thread/once.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,7 +10,13 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(once.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/once.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/once.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 namespace boost
 {

Modified: trunk/boost/thread/recursive_mutex.hpp
==============================================================================
--- trunk/boost/thread/recursive_mutex.hpp	(original)
+++ trunk/boost/thread/recursive_mutex.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,6 +10,12 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(recursive_mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/recursive_mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/recursive_mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: trunk/boost/thread/shared_mutex.hpp
==============================================================================
--- trunk/boost/thread/shared_mutex.hpp	(original)
+++ trunk/boost/thread/shared_mutex.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,6 +10,12 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(shared_mutex.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/shared_mutex.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/shared_mutex.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: trunk/boost/thread/thread.hpp
==============================================================================
--- trunk/boost/thread/thread.hpp	(original)
+++ trunk/boost/thread/thread.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -10,6 +10,13 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(thread.hpp)
+
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/thread.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/thread.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif

Modified: trunk/boost/thread/tss.hpp
==============================================================================
--- trunk/boost/thread/tss.hpp	(original)
+++ trunk/boost/thread/tss.hpp	2007-11-21 05:44:22 EST (Wed, 21 Nov 2007)
@@ -7,6 +7,12 @@
 #define BOOST_THREAD_TSS_HPP
 
 #include <boost/thread/detail/platform.hpp>
-#include BOOST_THREAD_PLATFORM(tss.hpp)
+#if defined(BOOST_THREAD_PLATFORM_WIN32)
+#include <boost/thread/win32/tss.hpp>
+#elif defined(BOOST_THREAD_PLATFORM_PTHREAD)
+#include <boost/thread/pthread/tss.hpp>
+#else
+#error "Boost threads unavailable on this platform"
+#endif
 
 #endif