[Boost-commit] svn:boost r81804 - trunk/boost/thread

Subject: [Boost-commit] svn:boost r81804 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2012-12-09 05:52:36

Author: viboes
Date: 2012-12-09 05:52:34 EST (Sun, 09 Dec 2012)
New Revision: 81804
URL: http://svn.boost.org/trac/boost/changeset/81804

Log:
Thread: Fix comments -use instead BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED
Text files modified: 
   trunk/boost/thread/externally_locked.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/thread/externally_locked.hpp
==============================================================================
--- trunk/boost/thread/externally_locked.hpp	(original)
+++ trunk/boost/thread/externally_locked.hpp	2012-12-09 05:52:34 EST (Sun, 09 Dec 2012)
@@ -53,7 +53,7 @@
 
     /**
      * Requires: T is a model of Movable.
-     * Effects: Constructs an externally locked object copying the cloaked type.
+     * Effects: Constructs an externally locked object by moving the cloaked type.
      */
     BOOST_CONSTEXPR externally_locked(mutex_type& mtx, BOOST_THREAD_RV_REF(T) obj) :
       obj_(move(obj)), mtx_(&mtx)
@@ -83,7 +83,7 @@
      *
      * Returns: The address of the cloaked object..
      *
-     * Throws: lock_error if BOOST_THREAD_EXTERNALLY_LOCKED_DONT_CHECK_SAME is not defined and the lk parameter doesn't satisfy the preconditions
+     * Throws: lock_error if BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED is not defined and the lk parameter doesn't satisfy the preconditions
      */
     T& get(strict_lock<mutex_type>& lk)
     {
@@ -117,7 +117,7 @@
      * Requires: The lk parameter must be locking the associated mtx.
      * Returns: The address of the cloaked object..
      *
-     * Throws: lock_error if BOOST_THREAD_EXTERNALLY_LOCKED_DONT_CHECK_SAME is not defined and the lk parameter doesn't satisfy the preconditions
+     * Throws: lock_error if BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED is not defined and the lk parameter doesn't satisfy the preconditions
      */
     template <class Lock>
     T& get(Lock& lk)
@@ -203,7 +203,7 @@
      *
      * Returns: The address of the cloaked object..
      *
-     * Throws: lock_error if BOOST_THREAD_EXTERNALLY_LOCKED_DONT_CHECK_SAME is not defined and the lk parameter doesn't satisfy the preconditions
+     * Throws: lock_error if BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED is not defined and the lk parameter doesn't satisfy the preconditions
      */
     T& get(strict_lock<mutex_type> const& lk)
     {
@@ -237,7 +237,7 @@
      * Requires: The lk parameter must be locking the associated mtx.
      * Returns: The address of the cloaked object..
      *
-     * Throws: lock_error if BOOST_THREAD_EXTERNALLY_LOCKED_DONT_CHECK_SAME is not defined and the lk parameter doesn't satisfy the preconditions
+     * Throws: lock_error if BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED is not defined and the lk parameter doesn't satisfy the preconditions
      */
     template <class Lock>
     T& get(Lock const& lk)
@@ -245,7 +245,7 @@
       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(), 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_;
     }
@@ -254,7 +254,7 @@
      * Requires: The lk parameter must be locking the associated mtx.
      * Returns: The address of the cloaked object..
      *
-     * Throws: lock_error if BOOST_THREAD_EXTERNALLY_LOCKED_DONT_CHECK_SAME is not defined and the lk parameter doesn't satisfy the preconditions
+     * Throws: lock_error if BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED is not defined and the lk parameter doesn't satisfy the preconditions
      */
     template <class Lock>
     T const& get(Lock const& lk) const
@@ -262,7 +262,7 @@
       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(), 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_;
     }