Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76959 - trunk/boost/thread
From: juergen.hunold_at_[hidden]
Date: 2012-02-09 15:21:43


Author: jhunold
Date: 2012-02-09 15:21:43 EST (Thu, 09 Feb 2012)
New Revision: 76959
URL: http://svn.boost.org/trac/boost/changeset/76959

Log:
Fix: correct logic for enabling c++11 explicit conversion operators
Text files modified:
   trunk/boost/thread/locks.hpp | 10 +++++-----
   1 files changed, 5 insertions(+), 5 deletions(-)

Modified: trunk/boost/thread/locks.hpp
==============================================================================
--- trunk/boost/thread/locks.hpp (original)
+++ trunk/boost/thread/locks.hpp 2012-02-09 15:21:43 EST (Thu, 09 Feb 2012)
@@ -600,7 +600,7 @@
             is_locked=false;
         }
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
         typedef void (unique_lock::*bool_type)();
         operator bool_type() const BOOST_NOEXCEPT
         {
@@ -931,7 +931,7 @@
             is_locked=false;
         }
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
         typedef void (shared_lock<Mutex>::*bool_type)();
         operator bool_type() const
         {
@@ -1172,7 +1172,7 @@
             is_locked=false;
         }
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
         typedef void (upgrade_lock::*bool_type)();
         operator bool_type() const
         {
@@ -1309,7 +1309,7 @@
             exclusive.swap(other.exclusive);
         }
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
         typedef void (upgrade_to_unique_lock::*bool_type)(upgrade_to_unique_lock&);
         operator bool_type() const
         {
@@ -1463,7 +1463,7 @@
                 return base::release();
             }
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#if defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS)
             typedef typename base::bool_type bool_type;
             operator bool_type() const
             {


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