merged from trunk

[SVN r47983]
This commit is contained in:
Eric Niebler
2008-08-05 05:39:57 +00:00
parent 67ae924182
commit 6fbbc86ecf
2 changed files with 7 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
/* Copyright 2003-2007 Joaqu<EFBFBD>n M L<EFBFBD>pez Mu<EFBFBD>oz. /* Copyright 2003-2008 Joaquin M Lopez Munoz.
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)

View File

@@ -79,25 +79,16 @@
// specialized on those types for this to work. // specialized on those types for this to work.
#include <locale> #include <locale>
// for mbstate_t #include <cwchar> // for mbstate_t
#include <wchar.h> #include <cstddef> // for std::size_t
// for std::size_t
#include <cstddef>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
namespace std { #if defined(BOOST_NO_STDC_NAMESPACE)
#if defined(__LIBCOMO__) using ::codecvt;
using ::mbstate_t; using ::mbstate_t;
#elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(__BORLANDC__) #endif
using ::mbstate_t;
#elif defined(__SGI_STL_PORT)
#elif defined(BOOST_NO_STDC_NAMESPACE)
using ::mbstate_t;
using ::codecvt;
#endif
} // namespace std
#if !defined(__MSL_CPP__) && !defined(__LIBCOMO__) #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)
#define BOOST_CODECVT_DO_LENGTH_CONST const #define BOOST_CODECVT_DO_LENGTH_CONST const