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