Ticket #6843: boost-future-intel-fix-20120421-0519.patch

boost/thread/future.hpp

@@ -1120 +1120 @@
         void lazy_init()
         {
 #if defined BOOST_THREAD_PROMISE_LAZY
+
+#if defined(BOOST_INTEL)
+
+#pragma push_macro("atomic_load")
+#undef atomic_load
+
+#pragma push_macro("atomic_compare_exchange")
+#undef atomic_compare_exchange
+
+#endif // #if defined(BOOST_INTEL)
+
             if(!atomic_load(&future_))
             {
                 future_ptr blank;
                 atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R>));
             }
+            
+#if defined(BOOST_INTEL)
+
+#pragma pop_macro("atomic_load")
+#pragma pop_macro("atomic_compare_exchange")
+
+#endif // #if defined(BOOST_INTEL)
+
 #endif
         }
 
@@ -1279 +1298 @@
         void lazy_init()
         {
 #if defined BOOST_THREAD_PROMISE_LAZY
+
+#if defined(BOOST_INTEL)
+
+#pragma push_macro("atomic_load")
+#undef atomic_load
+
+#pragma push_macro("atomic_compare_exchange")
+#undef atomic_compare_exchange
+
+#endif // #if defined(BOOST_INTEL)
+
             if(!atomic_load(&future_))
             {
                 future_ptr blank;
                 atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<void>));
             }
+            
+#if defined(BOOST_INTEL)
+
+#pragma pop_macro("atomic_load")
+#pragma pop_macro("atomic_compare_exchange")
+
+#endif // #if defined(BOOST_INTEL)
+
 #endif
         }
     public: