[Boost-commit] svn:boost r53595 - in trunk: boost/regex/v4 libs/regex/src

Subject: [Boost-commit] svn:boost r53595 - in trunk: boost/regex/v4 libs/regex/src
From: john_at_[hidden]
Date: 2009-06-03 07:24:23

Author: johnmaddock
Date: 2009-06-03 07:24:22 EDT (Wed, 03 Jun 2009)
New Revision: 53595
URL: http://svn.boost.org/trac/boost/changeset/53595

Log:
Try and fix build errors with VC-10 beta.
Text files modified: 
   trunk/boost/regex/v4/regex_workaround.hpp |     2 +-                                      
   trunk/libs/regex/src/usinstances.cpp      |     3 ++-                                     
   trunk/libs/regex/src/wc_regex_traits.cpp  |     3 ++-                                     
   3 files changed, 5 insertions(+), 3 deletions(-)

Modified: trunk/boost/regex/v4/regex_workaround.hpp
==============================================================================
--- trunk/boost/regex/v4/regex_workaround.hpp	(original)
+++ trunk/boost/regex/v4/regex_workaround.hpp	2009-06-03 07:24:22 EDT (Wed, 03 Jun 2009)
@@ -124,7 +124,7 @@
 
 #ifdef __cplusplus
 namespace boost{ namespace re_detail{
-#if BOOST_WORKAROUND(BOOST_MSVC,>=1400) && defined(_CPPLIB_VER) && defined(BOOST_DINKUMWARE_STDLIB) && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
+#if BOOST_WORKAROUND(BOOST_MSVC,>=1400) && BOOST_WORKAROUND(BOOST_MSVC, <1600) && defined(_CPPLIB_VER) && defined(BOOST_DINKUMWARE_STDLIB) && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
    //
    // MSVC 8 will either emit warnings or else refuse to compile
    // code that makes perfectly legitimate use of std::copy, when

Modified: trunk/libs/regex/src/usinstances.cpp
==============================================================================
--- trunk/libs/regex/src/usinstances.cpp	(original)
+++ trunk/libs/regex/src/usinstances.cpp	2009-06-03 07:24:22 EDT (Wed, 03 Jun 2009)
@@ -23,7 +23,8 @@
 #include <string>
 
 #if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \
-   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER))
+   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER))\
+   && BOOST_WORKAROUND(BOOST_MSVC, <1600)
 //
 // This is a horrible workaround, but without declaring these symbols extern we get
 // duplicate symbol errors when linking if the application is built without

Modified: trunk/libs/regex/src/wc_regex_traits.cpp
==============================================================================
--- trunk/libs/regex/src/wc_regex_traits.cpp	(original)
+++ trunk/libs/regex/src/wc_regex_traits.cpp	2009-06-03 07:24:22 EDT (Wed, 03 Jun 2009)
@@ -24,7 +24,8 @@
 #include <string>
 
 #if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \
-   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER))
+   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) || defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER))\
+   && BOOST_WORKAROUND(BOOST_MSVC, <1600)
 //
 // This is a horrible workaround, but without declaring these symbols extern we get
 // duplicate symbol errors when linking if the application is built without