[Boost-commit] svn:boost r49757 - trunk/libs/regex/src

Subject: [Boost-commit] svn:boost r49757 - trunk/libs/regex/src
From: john_at_[hidden]
Date: 2008-11-14 11:57:19

Author: johnmaddock
Date: 2008-11-14 11:57:19 EST (Fri, 14 Nov 2008)
New Revision: 49757
URL: http://svn.boost.org/trac/boost/changeset/49757

Log:
Fix for building with /Zc:wchar_t-.
Text files modified: 
   trunk/libs/regex/src/usinstances.cpp     |     2 +-                                      
   trunk/libs/regex/src/wc_regex_traits.cpp |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/libs/regex/src/usinstances.cpp
==============================================================================
--- trunk/libs/regex/src/usinstances.cpp	(original)
+++ trunk/libs/regex/src/usinstances.cpp	2008-11-14 11:57:19 EST (Fri, 14 Nov 2008)
@@ -22,7 +22,7 @@
 #include <memory>
 #include <string>
 
-#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) \
+#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))
 //
 // This is a horrible workaround, but without declaring these symbols extern we get

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	2008-11-14 11:57:19 EST (Fri, 14 Nov 2008)
@@ -23,7 +23,7 @@
 #include <memory>
 #include <string>
 
-#if defined(_DLL_CPPLIB) && !defined(_M_CEE_PURE) \
+#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))
 //
 // This is a horrible workaround, but without declaring these symbols extern we get