Subject: [Boost-commit] svn:boost r80960 - in branches/release: . boost boost/detail
From: pdimov_at_[hidden]
Date: 2012-10-11 15:51:05
Author: pdimov
Date: 2012-10-11 15:51:05 EDT (Thu, 11 Oct 2012)
New Revision: 80960
URL: http://svn.boost.org/trac/boost/changeset/80960
Log:
Merged revision(s) [80935] from trunk: Fix the _WIN32_WCE >= 0x600 case.
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/interlocked.hpp (contents, props changed)
Text files modified:
branches/release/boost/detail/interlocked.hpp | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
Modified: branches/release/boost/detail/interlocked.hpp
==============================================================================
--- branches/release/boost/detail/interlocked.hpp (original)
+++ branches/release/boost/detail/interlocked.hpp 2012-10-11 15:51:05 EDT (Thu, 11 Oct 2012)
@@ -41,6 +41,12 @@
extern "C" long __cdecl _InterlockedExchange( long volatile *, long );
extern "C" long __cdecl _InterlockedExchangeAdd( long volatile *, long );
+# define BOOST_INTERLOCKED_INCREMENT _InterlockedIncrement
+# define BOOST_INTERLOCKED_DECREMENT _InterlockedDecrement
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE _InterlockedCompareExchange
+# define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
+# define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
+
#else
// under Windows CE we still have old-style Interlocked* functions
@@ -50,14 +56,14 @@
extern "C" long __cdecl InterlockedExchange( long*, long );
extern "C" long __cdecl InterlockedExchangeAdd( long*, long );
-#endif
-
# define BOOST_INTERLOCKED_INCREMENT InterlockedIncrement
# define BOOST_INTERLOCKED_DECREMENT InterlockedDecrement
# define BOOST_INTERLOCKED_COMPARE_EXCHANGE InterlockedCompareExchange
# define BOOST_INTERLOCKED_EXCHANGE InterlockedExchange
# define BOOST_INTERLOCKED_EXCHANGE_ADD InterlockedExchangeAdd
+#endif
+
# define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long*)(dest),(long)(exchange),(long)(compare)))
# define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \