[Boost-commit] svn:boost r51572 - in trunk: boost/signals2 boost/signals2/detail libs/signals2/test

Subject: [Boost-commit] svn:boost r51572 - in trunk: boost/signals2 boost/signals2/detail libs/signals2/test
From: fmhess_at_[hidden]
Date: 2009-03-03 10:04:07

Author: fmhess
Date: 2009-03-03 10:04:06 EST (Tue, 03 Mar 2009)
New Revision: 51572
URL: http://svn.boost.org/trac/boost/changeset/51572

Log:
Trying to fix compile error on mutex_test.cpp on msvc9

Text files modified: 
   trunk/boost/signals2/detail/lwm_win32_cs.hpp |     2 +-                                      
   trunk/boost/signals2/mutex.hpp               |     2 +-                                      
   trunk/libs/signals2/test/mutex_test.cpp      |     2 +-                                      
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/signals2/detail/lwm_win32_cs.hpp
==============================================================================
--- trunk/boost/signals2/detail/lwm_win32_cs.hpp	(original)
+++ trunk/boost/signals2/detail/lwm_win32_cs.hpp	2009-03-03 10:04:06 EST (Tue, 03 Mar 2009)
@@ -83,7 +83,7 @@
         EnterCriticalSection(&cs_);
     }
 // TryEnterCriticalSection only exists on Windows NT 4.0 and later
-#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)
+#if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)) || (defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WIN2K)
     bool try_lock()
     {
         return TryEnterCriticalSection(&cs_) != 0;

Modified: trunk/boost/signals2/mutex.hpp
==============================================================================
--- trunk/boost/signals2/mutex.hpp	(original)
+++ trunk/boost/signals2/mutex.hpp	2009-03-03 10:04:06 EST (Tue, 03 Mar 2009)
@@ -28,7 +28,7 @@
 # include <boost/signals2/detail/lwm_nop.hpp>
 #elif defined(BOOST_HAS_PTHREADS)
 #  include <boost/signals2/detail/lwm_pthreads.hpp>
-#elif defined(BOOST_HAS_WINTHREADS) || defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
+#elif defined(BOOST_HAS_WINTHREADS)
 #  include <boost/signals2/detail/lwm_win32_cs.hpp>
 #else
 // Use #define BOOST_DISABLE_THREADS to avoid the error

Modified: trunk/libs/signals2/test/mutex_test.cpp
==============================================================================
--- trunk/libs/signals2/test/mutex_test.cpp	(original)
+++ trunk/libs/signals2/test/mutex_test.cpp	2009-03-03 10:04:06 EST (Tue, 03 Mar 2009)
@@ -267,7 +267,7 @@
 {
     test_lock<boost::signals2::mutex>()();
 // try_lock not supported on old versions of windows
-#if !defined(BOOST_HAS_WINTHREADS) || (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400))
+#if !defined(BOOST_HAS_WINTHREADS) || (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0400)) || (defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WIN2K)
     test_trylock<boost::signals2::mutex>()();
 #endif
     test_lock_exclusion<boost::signals2::mutex>()();