boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-14 21:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try and fix build errors with VC-10 beta.

Browse Source 
[SVN r53595]
This commit is contained in:
John Maddock
2009-06-03 11:24:22 +00:00
parent 944a01f39e
commit cd0535d368
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/v4/regex_workaround.hpp
View File

@ -124,7 +124,7 @@ inline void pointer_construct(T* p, const T& t)
#ifdef __cplusplus #ifdef __cplusplus
namespace boost{ namespace re_detail{ 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 // MSVC 8 will either emit warnings or else refuse to compile
// code that makes perfectly legitimate use of std::copy, when // code that makes perfectly legitimate use of std::copy, when

3
src/usinstances.cpp
View File

@ -23,7 +23,8 @@
#include <string> #include <string>
#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \ #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 // This is a horrible workaround, but without declaring these symbols extern we get
// duplicate symbol errors when linking if the application is built without // duplicate symbol errors when linking if the application is built without

3
src/wc_regex_traits.cpp
View File

@ -24,7 +24,8 @@
#include <string> #include <string>
#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) && defined(_NATIVE_WCHAR_T_DEFINED) \ #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 // This is a horrible workaround, but without declaring these symbols extern we get
// duplicate symbol errors when linking if the application is built without // duplicate symbol errors when linking if the application is built without