[Boost-commit] svn:boost r85796 - in trunk/boost/sync: detail/mutexes locks

Subject: [Boost-commit] svn:boost r85796 - in trunk/boost/sync: detail/mutexes locks
From: andrey.semashev_at_[hidden]
Date: 2013-09-19 17:13:25

Author: andysem
Date: 2013-09-19 17:13:25 EDT (Thu, 19 Sep 2013)
New Revision: 85796
URL: http://svn.boost.org/trac/boost/changeset/85796

Log:
Fixed compilation.

Text files modified: 
   trunk/boost/sync/detail/mutexes/mutex_posix.hpp       |     4 ++--                                    
   trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp |     6 +++---                                  
   trunk/boost/sync/locks/unique_lock.hpp                |     2 --                                      
   3 files changed, 5 insertions(+), 7 deletions(-)

Modified: trunk/boost/sync/detail/mutexes/mutex_posix.hpp
==============================================================================
--- trunk/boost/sync/detail/mutexes/mutex_posix.hpp	Thu Sep 19 16:48:25 2013	(r85795)
+++ trunk/boost/sync/detail/mutexes/mutex_posix.hpp	2013-09-19 17:13:25 EDT (Thu, 19 Sep 2013)	(r85796)
@@ -50,11 +50,11 @@
 public:
 #if defined(PTHREAD_MUTEX_INITIALIZER)
 #if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
-    BOOST_CONSTEXPR mutex() BOOST_NOEXCEPT : m_mutex{ PTHREAD_MUTEX_INITIALIZER }
+    BOOST_CONSTEXPR mutex() BOOST_NOEXCEPT : m_mutex(PTHREAD_MUTEX_INITIALIZER)
     {
     }
 #else
-    BOOST_CONSTEXPR mutex() BOOST_NOEXCEPT
+    mutex() BOOST_NOEXCEPT
     {
         BOOST_CONSTEXPR_OR_CONST pthread_mutex_t temp = PTHREAD_MUTEX_INITIALIZER;
         m_mutex = temp;

Modified: trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp
==============================================================================
--- trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp	Thu Sep 19 16:48:25 2013	(r85795)
+++ trunk/boost/sync/detail/mutexes/timed_mutex_posix.hpp	2013-09-19 17:13:25 EDT (Thu, 19 Sep 2013)	(r85796)
@@ -88,15 +88,15 @@
 #if defined(PTHREAD_MUTEX_INITIALIZER) && (defined(BOOST_SYNC_DETAIL_PTHREAD_HAS_TIMEDLOCK) || defined(PTHREAD_COND_INITIALIZER))
 #if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
     BOOST_CONSTEXPR timed_mutex() BOOST_NOEXCEPT :
-        m_mutex{ PTHREAD_MUTEX_INITIALIZER }
+        m_mutex(PTHREAD_MUTEX_INITIALIZER)
 #if !defined(BOOST_SYNC_DETAIL_PTHREAD_HAS_TIMEDLOCK)
-        , m_cond{ PTHREAD_COND_INITIALIZER },
+        , m_cond(PTHREAD_COND_INITIALIZER),
         m_is_locked(false)
 #endif
     {
     }
 #else
-    BOOST_CONSTEXPR timed_mutex() BOOST_NOEXCEPT
+    timed_mutex() BOOST_NOEXCEPT
     {
         BOOST_CONSTEXPR_OR_CONST pthread_mutex_t temp = PTHREAD_MUTEX_INITIALIZER;
         m_mutex = temp;

Modified: trunk/boost/sync/locks/unique_lock.hpp
==============================================================================
--- trunk/boost/sync/locks/unique_lock.hpp	Thu Sep 19 16:48:25 2013	(r85795)
+++ trunk/boost/sync/locks/unique_lock.hpp	2013-09-19 17:13:25 EDT (Thu, 19 Sep 2013)	(r85796)
@@ -167,9 +167,7 @@
     ~unique_lock()
     {
         if (m_is_locked)
-        {
             m_mutex->unlock();
-        }
     }
 
     unique_lock& operator= (BOOST_RV_REF(unique_lock) that) BOOST_NOEXCEPT