Fix for building with /Zc:wchar_t-.

[SVN r49757]
This commit is contained in:
John Maddock
2008-11-14 16:57:19 +00:00
parent 330f23e84c
commit b650e44ff2
2 changed files with 2 additions and 2 deletions

View File

@ -22,7 +22,7 @@
#include <memory> #include <memory>
#include <string> #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)) && !(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 // This is a horrible workaround, but without declaring these symbols extern we get

View File

@ -23,7 +23,7 @@
#include <memory> #include <memory>
#include <string> #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)) && !(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 // This is a horrible workaround, but without declaring these symbols extern we get