Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85931 - in trunk/boost/log: detail utility
From: steveire_at_[hidden]
Date: 2013-09-26 05:40:46


Author: skelly
Date: 2013-09-26 05:40:46 EDT (Thu, 26 Sep 2013)
New Revision: 85931
URL: http://svn.boost.org/trac/boost/changeset/85931

Log:
Log: Remove obsolete MSVC version checks.

Text files modified:
   trunk/boost/log/detail/spin_mutex.hpp | 2 +-
   trunk/boost/log/utility/unique_identifier_name.hpp | 4 ++--
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/log/detail/spin_mutex.hpp
==============================================================================
--- trunk/boost/log/detail/spin_mutex.hpp Thu Sep 26 05:40:30 2013 (r85930)
+++ trunk/boost/log/detail/spin_mutex.hpp 2013-09-26 05:40:46 EDT (Thu, 26 Sep 2013) (r85931)
@@ -79,7 +79,7 @@
 # endif
 # if defined(__INTEL_COMPILER)
 # define BOOST_LOG_COMPILER_BARRIER __asm { nop }
-# elif _MSC_VER >= 1310
+# else
 extern "C" void _ReadWriteBarrier(void);
 #pragma intrinsic(_ReadWriteBarrier)
 # define BOOST_LOG_COMPILER_BARRIER _ReadWriteBarrier()

Modified: trunk/boost/log/utility/unique_identifier_name.hpp
==============================================================================
--- trunk/boost/log/utility/unique_identifier_name.hpp Thu Sep 26 05:40:30 2013 (r85930)
+++ trunk/boost/log/utility/unique_identifier_name.hpp 2013-09-26 05:40:46 EDT (Thu, 26 Sep 2013) (r85931)
@@ -41,12 +41,12 @@
  */
 
 // In VC 7.0 and later when compiling with /ZI option __LINE__ macro is corrupted
-#if BOOST_WORKAROUND(BOOST_MSVC, >=1300)
+#ifdef BOOST_MSVC
 # define BOOST_LOG_UNIQUE_IDENTIFIER_NAME(prefix)\
     BOOST_LOG_UNIQUE_IDENTIFIER_NAME_INTERNAL(prefix, __COUNTER__)
 #else
 # define BOOST_LOG_UNIQUE_IDENTIFIER_NAME(prefix)\
     BOOST_LOG_UNIQUE_IDENTIFIER_NAME_INTERNAL(prefix, __LINE__)
-#endif // BOOST_WORKAROUND(BOOST_MSVC, >= 1300)
+#endif // BOOST_MSVC
 
 #endif // BOOST_LOG_UTILITY_UNIQUE_IDENTIFIER_NAME_HPP_INCLUDED_


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