Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r82457 - trunk/boost/thread/pthread
From: vicente.botet_at_[hidden]
Date: 2013-01-12 04:05:56


Author: viboes
Date: 2013-01-12 04:05:55 EST (Sat, 12 Jan 2013)
New Revision: 82457
URL: http://svn.boost.org/trac/boost/changeset/82457

Log:
Thread: change text associated to exceptions #7882.
Text files modified:
   trunk/boost/thread/pthread/condition_variable.hpp | 16 ++++++++--------
   trunk/boost/thread/pthread/condition_variable_fwd.hpp | 4 ++--
   2 files changed, 10 insertions(+), 10 deletions(-)

Modified: trunk/boost/thread/pthread/condition_variable.hpp
==============================================================================
--- trunk/boost/thread/pthread/condition_variable.hpp (original)
+++ trunk/boost/thread/pthread/condition_variable.hpp 2013-01-12 04:05:55 EST (Sat, 12 Jan 2013)
@@ -60,7 +60,7 @@
 #if defined BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED
         if(! m.owns_lock())
         {
- boost::throw_exception(condition_error(-1, "boost::condition_variable::wait precondition"));
+ boost::throw_exception(condition_error(-1, "boost::condition_variable::wait() failed precondition mutex not owned"));
         }
 #endif
         int res=0;
@@ -85,7 +85,7 @@
 #endif
         if(res)
         {
- boost::throw_exception(condition_error(res, "boost:: condition_variable constructor failed in pthread_cond_wait"));
+ boost::throw_exception(condition_error(res, "boost::condition_variable::wait failed in pthread_cond_wait"));
         }
     }
 
@@ -96,7 +96,7 @@
 #if defined BOOST_THREAD_THROW_IF_PRECONDITION_NOT_SATISFIED
         if (!m.owns_lock())
         {
- boost::throw_exception(condition_error(EPERM, "condition_variable do_wait_until: mutex not locked"));
+ boost::throw_exception(condition_error(EPERM, "boost::condition_variable::do_wait_until() failed precondition mutex not owned"));
         }
 #endif
         thread_cv_detail::lock_on_exit<unique_lock<mutex> > guard;
@@ -121,7 +121,7 @@
         }
         if(cond_res)
         {
- boost::throw_exception(condition_error(cond_res, "condition_variable failed in pthread_cond_timedwait"));
+ boost::throw_exception(condition_error(cond_res, "boost::condition_variable::do_wait_until failed in pthread_cond_timedwait"));
         }
         return true;
     }
@@ -154,13 +154,13 @@
             int const res=pthread_mutex_init(&internal_mutex,NULL);
             if(res)
             {
- boost::throw_exception(thread_resource_error(res, "condition_variable_any failed in pthread_mutex_init"));
+ boost::throw_exception(thread_resource_error(res, "boost::condition_variable_any::condition_variable_any() failed in pthread_mutex_init"));
             }
             int const res2=pthread_cond_init(&cond,NULL);
             if(res2)
             {
                 BOOST_VERIFY(!pthread_mutex_destroy(&internal_mutex));
- boost::throw_exception(thread_resource_error(res, "condition_variable_any failed in pthread_cond_init"));
+ boost::throw_exception(thread_resource_error(res, "boost::condition_variable_any::condition_variable_any() failed in pthread_cond_init"));
             }
         }
         ~condition_variable_any()
@@ -188,7 +188,7 @@
 #endif
             if(res)
             {
- boost::throw_exception(condition_error(res, "condition_variable_any failed in pthread_cond_wait"));
+ boost::throw_exception(condition_error(res, "boost::condition_variable_any::wait() failed in pthread_cond_wait"));
             }
         }
 
@@ -368,7 +368,7 @@
           }
           if(res)
           {
- boost::throw_exception(condition_error(res, "condition_variable_any failed in pthread_cond_timedwait"));
+ boost::throw_exception(condition_error(res, "boost::condition_variable_any::do_wait_until() failed in pthread_cond_timedwait"));
           }
           return true;
         }

Modified: trunk/boost/thread/pthread/condition_variable_fwd.hpp
==============================================================================
--- trunk/boost/thread/pthread/condition_variable_fwd.hpp (original)
+++ trunk/boost/thread/pthread/condition_variable_fwd.hpp 2013-01-12 04:05:55 EST (Sat, 12 Jan 2013)
@@ -59,7 +59,7 @@
             int const res=pthread_mutex_init(&internal_mutex,NULL);
             if(res)
             {
- boost::throw_exception(thread_resource_error(res, "boost:: condition_variable constructor failed in pthread_mutex_init"));
+ boost::throw_exception(thread_resource_error(res, "boost::condition_variable::condition_variable() constructor failed in pthread_mutex_init"));
             }
 #endif
             int const res2=pthread_cond_init(&cond,NULL);
@@ -68,7 +68,7 @@
 #if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                 BOOST_VERIFY(!pthread_mutex_destroy(&internal_mutex));
 #endif
- boost::throw_exception(thread_resource_error(res2, "boost:: condition_variable constructor failed in pthread_cond_init"));
+ boost::throw_exception(thread_resource_error(res2, "boost::condition_variable::condition_variable() constructor failed in pthread_cond_init"));
             }
         }
         ~condition_variable()


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk