Re: [boost] [serialization][trunk] mingw non-wide char regressions

From: John Maddock (john_at_[hidden])
Date: 2007-11-24 13:22:39

John Maddock wrote:

> I'm testing now with the macros changed to use the W variants...

OK, tested the patch below with msvc-8 and Mingw: there are no msvc-8 
regressions and most of the Mingw tests now pass.

Robert: does this look OK?

John.

Index: boost/archive/codecvt_null.hpp
===================================================================
--- boost/archive/codecvt_null.hpp      (revision 41302)
+++ boost/archive/codecvt_null.hpp      (working copy)
@@ -59,7 +59,7 @@
 template<>
 class codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, 
std::mbstate_t
>
 {
-    virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
     do_out(
         std::mbstate_t & state,
         const wchar_t * first1,
@@ -69,7 +69,7 @@
         char * last2,
         char * & next2
     ) const;
-    virtual BOOST_ARCHIVE_DECL(std::codecvt_base::result)
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
     do_in(
         std::mbstate_t & state,
         const char * first1,
Index: libs/serialization/build/Jamfile.v2
===================================================================
--- libs/serialization/build/Jamfile.v2 (revision 41302)
+++ libs/serialization/build/Jamfile.v2 (working copy)
@@ -44,7 +44,6 @@
     basic_xml_archive
     binary_iarchive
     binary_oarchive
-    codecvt_null
     extended_type_info
     extended_type_info_no_rtti
     extended_type_info_typeid
@@ -60,6 +59,7 @@
 ;

 WSOURCES =
+    codecvt_null
     basic_text_wiprimitive
     basic_text_woprimitive
     binary_wiarchive
@@ -86,4 +86,4 @@
           <conditional>@include-spirit
        ;

-boost-install boost_serialization boost_wserialization ;
\ No newline at end of file
+boost-install boost_serialization boost_wserialization ;
Index: libs/serialization/src/codecvt_null.cpp
===================================================================
--- libs/serialization/src/codecvt_null.cpp     (revision 41302)
+++ libs/serialization/src/codecvt_null.cpp     (working copy)
@@ -7,7 +7,7 @@
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)

-#define BOOST_ARCHIVE_SOURCE
+#define BOOST_WARCHIVE_SOURCE
 #include <boost/archive/codecvt_null.hpp>

 // codecvt implementation for passing wchar_t objects to char output