11 changes: 1 addition & 10 deletions include/boost/archive/xml_woarchive.hpp
View file
Expand Up @@ -20,7 +20,6 @@
#ifdef BOOST_NO_STD_WSTREAMBUF
#error "wide char i/o not supported on this platform"
#else

#include <cstddef> // size_t
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
Expand All @@ -36,15 +35,7 @@ namespace std{
#include <boost/archive/basic_xml_oarchive.hpp>
#include <boost/archive/detail/register_archive.hpp>
#include <boost/serialization/item_version_type.hpp>

#ifdef BOOST_NO_CXX11_HDR_CODECVT
#include <boost/archive/detail/utf8_codecvt_facet.hpp>
#else
#include <codecvt>
namespace boost { namespace archive { namespace detail {
typedef std::codecvt_utf8<wchar_t> utf8_codecvt_facet;
} } }
#endif
#include <boost/archive/detail/utf8_codecvt_facet.hpp>

#include <boost/archive/detail/abi_prefix.hpp> // must be the last header

Expand Down
3 changes: 3 additions & 0 deletions src/utf8_codecvt_facet.cpp
View file
Expand Up @@ -5,7 +5,10 @@

#define BOOST_ARCHIVE_SOURCE
#include <boost/config.hpp>

#include <boost/archive/detail/auto_link_archive.hpp>
#include <boost/archive/detail/utf8_codecvt_facet.hpp>

#ifdef BOOST_NO_STD_WSTREAMBUF
#error "wide char i/o not supported on this platform"
#else
Expand Down
4 changes: 2 additions & 2 deletions test/Jamfile.v2
View file
Expand Up @@ -61,8 +61,8 @@ lib dll_polymorphic_derived2_lib
test-suite "serialization" :
[ test-bsl-run_files test_array : A ]
[ test-bsl-run_files test_binary ]
[ test-bsl-run_files test_class_info_load ]
[ test-bsl-run_files test_class_info_save ]
[ test-bsl-run_files test_class_info_load ]
[ test-bsl-run_files test_bitset ]
[ test-bsl-run_files test_complex ]
[ test-bsl-run_files test_contained_class : A ]
Expand Down Expand Up @@ -133,7 +133,7 @@ if ! $(BOOST_ARCHIVE_LIST) {
[ test-bsl-run test_reset_object_address : A ]
[ test-bsl-run test_void_cast ]
[ test-bsl-run test_mult_archive_types ]
[ test-bsl-run test_iterators : : ../build//boost_wserialization ]
[ test-bsl-run test_iterators : : ../build//boost_serialization ]

[ test-bsl-run-no-lib test_iterators_base64 ]
[ test-bsl-run-no-lib test_inclusion ]
Expand Down
11 changes: 2 additions & 9 deletions test/test_utf8_codecvt.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include <cwchar>
#include <boost/config.hpp>

#include <boost/archive/detail/utf8_codecvt_facet.hpp>

#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::size_t;
Expand All @@ -41,15 +43,6 @@ namespace std{

#include "test_tools.hpp"

#ifndef BOOST_NO_CXX11_HDR_CODECVT
#include <codecvt>
namespace boost { namespace archive { namespace detail {
typedef std::codecvt_utf8<wchar_t> utf8_codecvt_facet;
} } }
#else
#include <boost/archive/detail/utf8_codecvt_facet.hpp>
#endif

template<std::size_t s>
struct test_data
{
Expand Down