Merge changes in Trunk.

[SVN r50499]
This commit is contained in:
John Maddock committed 2009-01-07 13:19:32 +00:00
1 parent 3b3a3ce6d1
commit e81f710567
116 files changed
+4794 -4419

No files matched your search

+5
View File
@@ -28,6 +28,10 @@
typedef boost::match_flag_type match_flag_type;
#include <cstdio>
#ifdef BOOST_MSVC
#pragma warning(disable:4309)
#endif
namespace boost{
#ifdef __BORLANDC__
@@ -641,3 +645,4 @@ basic_string<wchar_t>::replace<const wchar_t*>(wchar_t* f1, wchar_t* f2, const w
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -29,7 +29,7 @@
#include <cstring>
#include <cstdio>
#if defined(BOOST_NO_STDC_NAMESPACE)
#if defined(BOOST_NO_STDC_NAMESPACE) || defined(__NetBSD__)
namespace std{
# ifndef BOOST_NO_SWPRINTF
using ::swprintf;