Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r82155 - trunk/boost/atomic/detail
From: andrey.semashev_at_[hidden]
Date: 2012-12-21 15:36:27


Author: andysem
Date: 2012-12-21 15:36:26 EST (Fri, 21 Dec 2012)
New Revision: 82155
URL: http://svn.boost.org/trac/boost/changeset/82155

Log:
Attempt to fix compilation on Windows CE.
Text files modified:
   trunk/boost/atomic/detail/interlocked.hpp | 6 +++---
   trunk/boost/atomic/detail/windows.hpp | 2 +-
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/atomic/detail/interlocked.hpp
==============================================================================
--- trunk/boost/atomic/detail/interlocked.hpp (original)
+++ trunk/boost/atomic/detail/interlocked.hpp 2012-12-21 15:36:26 EST (Fri, 21 Dec 2012)
@@ -18,9 +18,9 @@
 
 #include <boost/detail/interlocked.hpp>
 
-#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) BOOST_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare)
-#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) BOOST_INTERLOCKED_EXCHANGE(dest, newval)
-#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) BOOST_INTERLOCKED_EXCHANGE_ADD(dest, addend)
+#define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE(dest, exchange, compare) BOOST_INTERLOCKED_COMPARE_EXCHANGE((long*)(dest), exchange, compare)
+#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE(dest, newval) BOOST_INTERLOCKED_EXCHANGE((long*)(dest), newval)
+#define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD(dest, addend) BOOST_INTERLOCKED_EXCHANGE_ADD((long*)(dest), addend)
 #define BOOST_ATOMIC_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare) BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest, exchange, compare)
 #define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_POINTER(dest, newval) BOOST_INTERLOCKED_EXCHANGE_POINTER(dest, newval)
 #define BOOST_ATOMIC_INTERLOCKED_EXCHANGE_ADD_POINTER(dest, byte_offset) ((void*)BOOST_INTERLOCKED_EXCHANGE_ADD((long*)(dest), byte_offset))

Modified: trunk/boost/atomic/detail/windows.hpp
==============================================================================
--- trunk/boost/atomic/detail/windows.hpp (original)
+++ trunk/boost/atomic/detail/windows.hpp 2012-12-21 15:36:26 EST (Fri, 21 Dec 2012)
@@ -54,7 +54,7 @@
 }
 
 // Define compiler barriers
-#if defined(_MSC_VER) && _MSC_VER >= 1310
+#if defined(_MSC_VER) && _MSC_VER >= 1310 && !defined(_WIN32_WCE)
 
 extern "C" void _ReadWriteBarrier();
 #pragma intrinsic(_ReadWriteBarrier)


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