Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r83904 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-04-14 17:29:02


Author: viboes
Date: 2013-04-14 17:29:02 EDT (Sun, 14 Apr 2013)
New Revision: 83904
URL: http://svn.boost.org/trac/boost/changeset/83904

Log:
Thread: apply patch for #6843.
Text files modified:
   trunk/boost/thread/future.hpp | 6 +++++-
   1 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/boost/thread/future.hpp
==============================================================================
--- trunk/boost/thread/future.hpp (original)
+++ trunk/boost/thread/future.hpp 2013-04-14 17:29:02 EDT (Sun, 14 Apr 2013)
@@ -1707,11 +1707,13 @@
         void lazy_init()
         {
 #if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
- if(!atomic_load(&future_))
+#include <boost/detail/atomic_undef_macros.hpp>
+ if(!atomic_load(&future_))
             {
                 future_ptr blank;
                 atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R>));
             }
+#include <boost/detail/atomic_redef_macros.hpp>
 #endif
         }
 
@@ -1874,11 +1876,13 @@
         void lazy_init()
         {
 #if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
+#include <boost/detail/atomic_undef_macros.hpp>
             if(!atomic_load(&future_))
             {
                 future_ptr blank;
                 atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R&>));
             }
+#include <boost/detail/atomic_redef_macros.hpp>
 #endif
         }
 


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