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

Subject: [Boost-commit] svn:boost r84110 - in trunk/boost/thread: . detail
From: vicente.botet_at_[hidden]
Date: 2013-05-02 11:42:13

Author: viboes
Date: 2013-05-02 11:42:12 EDT (Thu, 02 May 2013)
New Revision: 84110
URL: http://svn.boost.org/trac/boost/changeset/84110

Log:
Thread: update externally_locked.
Text files modified: 
   trunk/boost/thread/detail/thread.hpp     |    32 ++++++++++++++++----------------        
   trunk/boost/thread/externally_locked.hpp |     3 ---                                     
   2 files changed, 16 insertions(+), 19 deletions(-)

Modified: trunk/boost/thread/detail/thread.hpp
==============================================================================
--- trunk/boost/thread/detail/thread.hpp	(original)
+++ trunk/boost/thread/detail/thread.hpp	2013-05-02 11:42:12 EDT (Thu, 02 May 2013)
@@ -157,7 +157,7 @@
 #endif
     }
 
-    class BOOST_THREAD_DECL thread
+    class thread
     {
     public:
       typedef thread_attributes attributes;
@@ -167,13 +167,13 @@
 
         struct dummy;
 
-        void release_handle();
+        BOOST_THREAD_DECL void release_handle();
 
         detail::thread_data_ptr thread_info;
 
     private:
-        bool start_thread_noexcept();
-        bool start_thread_noexcept(const attributes& attr);
+        BOOST_THREAD_DECL bool start_thread_noexcept();
+        BOOST_THREAD_DECL bool start_thread_noexcept(const attributes& attr);
     public:
         void start_thread()
         {
@@ -190,9 +190,9 @@
           }
         }
 
-        explicit thread(detail::thread_data_ptr data);
+        BOOST_THREAD_DECL explicit thread(detail::thread_data_ptr data);
 
-        detail::thread_data_ptr get_thread_info BOOST_PREVENT_MACRO_SUBSTITUTION () const;
+        BOOST_THREAD_DECL detail::thread_data_ptr get_thread_info BOOST_PREVENT_MACRO_SUBSTITUTION () const;
 
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
@@ -243,7 +243,7 @@
         thread(const volatile thread&);
 #endif
 #endif
-        thread() BOOST_NOEXCEPT;
+        BOOST_THREAD_DECL thread() BOOST_NOEXCEPT;
         ~thread()
         {
 
@@ -459,9 +459,9 @@
 #endif
 
 
-        bool joinable() const BOOST_NOEXCEPT;
+        BOOST_THREAD_DECL bool joinable() const BOOST_NOEXCEPT;
     private:
-        bool join_noexcept();
+        BOOST_THREAD_DECL bool join_noexcept();
     public:
         inline void join();
 
@@ -494,10 +494,10 @@
 #endif
 #if defined(BOOST_THREAD_PLATFORM_WIN32)
     private:
-        bool do_try_join_until_noexcept(uintmax_t milli, bool& res);
+        BOOST_THREAD_DECL bool do_try_join_until_noexcept(uintmax_t milli, bool& res);
         inline bool do_try_join_until(uintmax_t milli);
     public:
-        bool timed_join(const system_time& abs_time);
+        BOOST_THREAD_DECL bool timed_join(const system_time& abs_time);
         //{
         //  return do_try_join_until(get_milliseconds_until(wait_until));
         //}
@@ -543,13 +543,13 @@
             return timed_join(get_system_time()+rel_time);
         }
 #endif
-        void detach();
+        BOOST_THREAD_DECL void detach();
 
-        static unsigned hardware_concurrency() BOOST_NOEXCEPT;
+        BOOST_THREAD_DECL static unsigned hardware_concurrency() BOOST_NOEXCEPT;
 
 #define BOOST_THREAD_DEFINES_THREAD_NATIVE_HANDLE
         typedef detail::thread_data_base::native_handle_type native_handle_type;
-        native_handle_type native_handle();
+        BOOST_THREAD_DECL native_handle_type native_handle();
 
 #if defined BOOST_THREAD_PROVIDES_THREAD_EQ
         // Use thread::id when comparisions are needed
@@ -571,8 +571,8 @@
 
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
         // extensions
-        void interrupt();
-        bool interruption_requested() const BOOST_NOEXCEPT;
+        BOOST_THREAD_DECL void interrupt();
+        BOOST_THREAD_DECL bool interruption_requested() const BOOST_NOEXCEPT;
 #endif
     };
 

Modified: trunk/boost/thread/externally_locked.hpp
==============================================================================
--- trunk/boost/thread/externally_locked.hpp	(original)
+++ trunk/boost/thread/externally_locked.hpp	2013-05-02 11:42:12 EDT (Thu, 02 May 2013)
@@ -156,7 +156,6 @@
       BOOST_STATIC_ASSERT( (is_strict_lock<Lock>::value)); /*< lk is a strict lock "sur parolle" >*/
       BOOST_STATIC_ASSERT( (is_same<mutex_type, typename Lock::mutex_type>::value)); /*< that locks the same type >*/
 
-      //BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(), lock_error() ); /*< run time check throw if no locked >*/
       BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(mtx_), lock_error() ); /*< run time check throw if not locks the same >*/
 
       return obj_;
@@ -295,7 +294,6 @@
       BOOST_CONCEPT_ASSERT(( StrictLock<Lock> ));
       BOOST_STATIC_ASSERT( (is_strict_lock<Lock>::value)); /*< lk is a strict lock "sur parolle" >*/
       BOOST_STATIC_ASSERT( (is_same<mutex_type, typename Lock::mutex_type>::value)); /*< that locks the same type >*/
-      //BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(), lock_error() ); /*< run time check throw if no locked >*/
       BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(mtx_), lock_error() ); /*< run time check throw if not locks the same >*/
       return *obj_;
     }
@@ -312,7 +310,6 @@
       BOOST_CONCEPT_ASSERT(( StrictLock<Lock> ));
       BOOST_STATIC_ASSERT( (is_strict_lock<Lock>::value)); /*< lk is a strict lock "sur parolle" >*/
       BOOST_STATIC_ASSERT( (is_same<mutex_type, typename Lock::mutex_type>::value)); /*< that locks the same type >*/
-      //BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(), lock_error() ); /*< run time check throw if no locked >*/
       BOOST_THREAD_ASSERT_PRECONDITION(  lk.owns_lock(mtx_), lock_error() ); /*< run time check throw if not locks the same >*/
       return *obj_;
     }