[Boost-commit] svn:boost r57699 - in branches/release/boost/archive: . detail impl iterators

Subject: [Boost-commit] svn:boost r57699 - in branches/release/boost/archive: . detail impl iterators
From: ramey_at_[hidden]
Date: 2009-11-16 00:28:03

Author: ramey
Date: 2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
New Revision: 57699
URL: http://svn.boost.org/trac/boost/changeset/57699

Log:
Revert changes target for trunk
Text files modified: 
   branches/release/boost/archive/basic_archive.hpp                     |    19 ++++++++-----------                     
   branches/release/boost/archive/basic_binary_iarchive.hpp             |     9 ---------                               
   branches/release/boost/archive/basic_binary_iprimitive.hpp           |    10 ++++------                              
   branches/release/boost/archive/basic_binary_oarchive.hpp             |    15 +--------------                         
   branches/release/boost/archive/basic_binary_oprimitive.hpp           |     7 +++----                                 
   branches/release/boost/archive/basic_streambuf_locale_saver.hpp      |    15 +--------------                         
   branches/release/boost/archive/basic_text_iarchive.hpp               |     9 ---------                               
   branches/release/boost/archive/basic_text_oarchive.hpp               |     9 ---------                               
   branches/release/boost/archive/basic_text_oprimitive.hpp             |    19 +------------------                     
   branches/release/boost/archive/basic_xml_iarchive.hpp                |     9 ---------                               
   branches/release/boost/archive/basic_xml_oarchive.hpp                |     9 ---------                               
   branches/release/boost/archive/binary_iarchive.hpp                   |     9 ---------                               
   branches/release/boost/archive/binary_iarchive_impl.hpp              |     9 ---------                               
   branches/release/boost/archive/binary_oarchive.hpp                   |    10 ----------                              
   branches/release/boost/archive/binary_oarchive_impl.hpp              |    10 ----------                              
   branches/release/boost/archive/codecvt_null.hpp                      |     8 --------                                
   branches/release/boost/archive/detail/basic_iarchive.hpp             |     5 +----                                   
   branches/release/boost/archive/detail/basic_iserializer.hpp          |    10 +---------                              
   branches/release/boost/archive/detail/basic_oarchive.hpp             |     7 ++-----                                 
   branches/release/boost/archive/detail/basic_oserializer.hpp          |    11 +----------                             
   branches/release/boost/archive/detail/basic_pointer_iserializer.hpp  |    11 +----------                             
   branches/release/boost/archive/detail/basic_pointer_oserializer.hpp  |    14 ++------------                          
   branches/release/boost/archive/detail/basic_serializer.hpp           |     9 ---------                               
   branches/release/boost/archive/detail/check.hpp                      |    10 +++++-----                              
   branches/release/boost/archive/detail/common_iarchive.hpp            |    11 -----------                             
   branches/release/boost/archive/detail/common_oarchive.hpp            |    11 -----------                             
   branches/release/boost/archive/detail/iserializer.hpp                |    20 +-------------------                    
   branches/release/boost/archive/detail/oserializer.hpp                |    24 +++---------------------                
   branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp |    13 +++----------                           
   branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp |    13 +++----------                           
   branches/release/boost/archive/impl/archive_serializer_map.ipp       |     9 ---------                               
   branches/release/boost/archive/iterators/escape.hpp                  |     2 +-                                      
   branches/release/boost/archive/iterators/istream_iterator.hpp        |     2 +-                                      
   branches/release/boost/archive/iterators/unescape.hpp                |    11 +++++++----                             
   branches/release/boost/archive/iterators/xml_unescape.hpp            |    17 +++--------------                       
   branches/release/boost/archive/polymorphic_binary_iarchive.hpp       |     9 ---------                               
   branches/release/boost/archive/polymorphic_text_iarchive.hpp         |     9 ---------                               
   branches/release/boost/archive/polymorphic_text_wiarchive.hpp        |     9 ---------                               
   branches/release/boost/archive/polymorphic_xml_iarchive.hpp          |     9 ---------                               
   branches/release/boost/archive/text_iarchive.hpp                     |    18 ------------------                      
   branches/release/boost/archive/text_oarchive.hpp                     |    10 +---------                              
   branches/release/boost/archive/text_wiarchive.hpp                    |    18 ------------------                      
   branches/release/boost/archive/text_woarchive.hpp                    |    13 ++-----------                           
   branches/release/boost/archive/xml_iarchive.hpp                      |    18 ------------------                      
   branches/release/boost/archive/xml_oarchive.hpp                      |     9 ---------                               
   branches/release/boost/archive/xml_wiarchive.hpp                     |    19 -------------------                     
   branches/release/boost/archive/xml_woarchive.hpp                     |     9 ---------                               
   47 files changed, 56 insertions(+), 480 deletions(-)

Modified: branches/release/boost/archive/basic_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_archive.hpp	(original)
+++ branches/release/boost/archive/basic_archive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -17,9 +17,8 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <boost/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/serialization/strong_typedef.hpp>
+#include <boost/noncopyable.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -27,12 +26,12 @@
 namespace boost {
 namespace archive {
 
-BOOST_STRONG_TYPEDEF(boost::int_least16_t, version_type)
-BOOST_STRONG_TYPEDEF(boost::int_least16_t, class_id_type)
-BOOST_STRONG_TYPEDEF(boost::int_least16_t, class_id_optional_type)
-BOOST_STRONG_TYPEDEF(boost::int_least16_t, class_id_reference_type)
-BOOST_STRONG_TYPEDEF(boost::uint_least32_t, object_id_type)
-BOOST_STRONG_TYPEDEF(boost::uint_least32_t, object_reference_type)
+BOOST_STRONG_TYPEDEF(unsigned int, version_type)
+BOOST_STRONG_TYPEDEF(int, class_id_type)
+BOOST_STRONG_TYPEDEF(int, class_id_optional_type)
+BOOST_STRONG_TYPEDEF(int, class_id_reference_type)
+BOOST_STRONG_TYPEDEF(unsigned int, object_id_type)
+BOOST_STRONG_TYPEDEF(unsigned int, object_reference_type)
 
 struct tracking_type {
 //    typedef bool value_type;
@@ -65,9 +64,7 @@
     }
 };
 
-struct class_name_type : 
-    private boost::noncopyable 
-{
+struct class_name_type : private boost::noncopyable {
     char *t;
     operator const char * & () const {
         return const_cast<const char * &>(t);

Modified: branches/release/boost/archive/basic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -31,11 +31,6 @@
 #include <boost/serialization/collection_size_type.hpp>
 #include <boost/serialization/string.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost { 
@@ -132,10 +127,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_BINARY_IARCHIVE_HPP

Modified: branches/release/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_iprimitive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -46,8 +46,8 @@
 #include <boost/cstdint.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/serialization/throw_exception.hpp>
-#include <boost/integer.hpp>
-#include <boost/integer_traits.hpp>
+//#include <boost/limits.hpp>
+//#include <boost/io/ios_state.hpp>
 
 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/archive_exception.hpp>
@@ -151,8 +151,7 @@
     std::size_t count
 ){
     // note: an optimizer should eliminate the following for char files
-    assert(count / sizeof(Elem) <= boost::integer_traits<std::streamsize>::const_max);
-    std::streamsize s = static_cast<std::streamsize>(count / sizeof(Elem));
+    std::streamsize s = count / sizeof(Elem);
     std::streamsize scount = m_sb.sgetn(
         static_cast<Elem *>(address), 
         s
@@ -162,8 +161,7 @@
             archive_exception(archive_exception::stream_error)
         );
     // note: an optimizer should eliminate the following for char files
-    assert(count % sizeof(Elem) <= boost::integer_traits<std::streamsize>::const_max);
-    s = static_cast<std::streamsize>(count % sizeof(Elem));
+    s = count % sizeof(Elem);
     if(0 < s){
 //        if(is.fail())
 //            boost::serialization::throw_exception(

Modified: branches/release/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oarchive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -35,13 +35,6 @@
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/collection_size_type.hpp>
 
-#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
-
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -93,7 +86,7 @@
     void save_override(const class_id_reference_type & t, int){
         // upto 32K classes
         assert(t.t <= boost::integer_traits<boost::int_least16_t>::const_max);
-        const boost::int_least16_t x = t.t;
+        const boost::uint_least16_t x = t.t;
         * this->This() << x;
     }
     void save_override(const object_id_type & t, int){
@@ -136,10 +129,4 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
-#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
-
 #endif // BOOST_ARCHIVE_BASIC_BINARY_OARCHIVE_HPP

Modified: branches/release/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_binary_oprimitive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -38,8 +38,8 @@
 #endif
 
 #include <boost/cstdint.hpp>
-#include <boost/integer.hpp>
-#include <boost/integer_traits.hpp>
+//#include <boost/limits.hpp>
+//#include <boost/io/ios_state.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/serialization/throw_exception.hpp>
 
@@ -160,10 +160,9 @@
     // figure number of elements to output - round up
     count = ( count + sizeof(Elem) - 1) 
         / sizeof(Elem);
-    assert(count <= boost::integer_traits<std::streamsize>::const_max);
     std::streamsize scount = m_sb.sputn(
         static_cast<const Elem *>(address), 
-        static_cast<std::streamsize>(count)
+        count
     );
     if(count != static_cast<std::size_t>(scount))
         boost::serialization::throw_exception(

Modified: branches/release/boost/archive/basic_streambuf_locale_saver.hpp
==============================================================================
--- branches/release/boost/archive/basic_streambuf_locale_saver.hpp	(original)
+++ branches/release/boost/archive/basic_streambuf_locale_saver.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -29,20 +29,11 @@
 #include <locale>     // for std::locale
 #include <streambuf>  // for std::basic_streambuf
 
-#include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
-
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost{
 namespace archive{
 
 template < typename Ch, class Tr >
-class basic_streambuf_locale_saver :
-    private boost::noncopyable
+class basic_streambuf_locale_saver
 {
 public:
     typedef ::std::basic_streambuf<Ch, Tr> state_type;
@@ -65,9 +56,5 @@
 } // archive
 } // boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_NO_STD_LOCALE
 #endif // BOOST_ARCHIVE_BASIC_STREAMBUF_LOCALE_SAVER_HPP

Modified: branches/release/boost/archive/basic_text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iarchive.hpp	(original)
+++ branches/release/boost/archive/basic_text_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -33,11 +33,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -84,10 +79,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_TEXT_IARCHIVE_HPP

Modified: branches/release/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oarchive.hpp	(original)
+++ branches/release/boost/archive/basic_text_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -34,11 +34,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -134,10 +129,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_TEXT_OARCHIVE_HPP

Modified: branches/release/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oprimitive.hpp	(original)
+++ branches/release/boost/archive/basic_text_oprimitive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -29,7 +29,6 @@
 #include <boost/config/no_tr1/cmath.hpp> // isnan
 #include <cassert>
 #include <cstddef> // size_t
-#include <boost/serialization/collection_size_type.hpp>
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
@@ -137,22 +136,6 @@
         os << static_cast<int>(t);
     }
     #endif
-    void save(const std::size_t t)
-    {
-        if(os.fail())
-            boost::serialization::throw_exception(
-                archive_exception(archive_exception::stream_error)
-            );
-        os << static_cast<std::streamsize>(t);
-    }
-    void save(const boost::serialization::collection_size_type t)
-    {
-        if(os.fail())
-            boost::serialization::throw_exception(
-                archive_exception(archive_exception::stream_error)
-            );
-        os << static_cast<std::streamsize>(t);
-    }
     void save(const float t)
     {
         // must be a user mistake - can't serialize un-initialized data
@@ -179,7 +162,7 @@
     ~basic_text_oprimitive();
 public:
     // unformatted append of one character
-    void put(BOOST_DEDUCED_TYPENAME OStream::char_type c){
+    void put(int c){
         if(os.fail())
             boost::serialization::throw_exception(
                 archive_exception(archive_exception::stream_error)

Modified: branches/release/boost/archive/basic_xml_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_xml_iarchive.hpp	(original)
+++ branches/release/boost/archive/basic_xml_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -29,11 +29,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -118,10 +113,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_XML_IARCHIVE_HPP

Modified: branches/release/boost/archive/basic_xml_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_xml_oarchive.hpp	(original)
+++ branches/release/boost/archive/basic_xml_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -28,11 +28,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -136,10 +131,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_XML_OARCHIVE_HPP

Modified: branches/release/boost/archive/binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/binary_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -20,11 +20,6 @@
 #include <boost/archive/binary_iarchive_impl.hpp>
 #include <boost/archive/detail/register_archive.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -96,8 +91,4 @@
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::binary_iarchive)
 BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::archive::binary_iarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_BINARY_IARCHIVE_HPP

Modified: branches/release/boost/archive/binary_iarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_iarchive_impl.hpp	(original)
+++ branches/release/boost/archive/binary_iarchive_impl.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -21,11 +21,6 @@
 #include <boost/archive/basic_binary_iprimitive.hpp>
 #include <boost/archive/basic_binary_iarchive.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -89,8 +84,4 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_BINARY_IARCHIVE_IMPL_HPP

Modified: branches/release/boost/archive/binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/binary_oarchive.hpp	(original)
+++ branches/release/boost/archive/binary_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -17,15 +17,9 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <ostream>
-#include <boost/config.hpp>
 #include <boost/archive/binary_oarchive_impl.hpp>
 #include <boost/archive/detail/register_archive.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -59,8 +53,4 @@
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::binary_oarchive)
 BOOST_SERIALIZATION_USE_ARRAY_OPTIMIZATION(boost::archive::binary_oarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_BINARY_OARCHIVE_HPP

Modified: branches/release/boost/archive/binary_oarchive_impl.hpp
==============================================================================
--- branches/release/boost/archive/binary_oarchive_impl.hpp	(original)
+++ branches/release/boost/archive/binary_oarchive_impl.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -17,16 +17,10 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <ostream>
-#include <boost/config.hpp>
 #include <boost/serialization/pfto.hpp>
 #include <boost/archive/basic_binary_oprimitive.hpp>
 #include <boost/archive/basic_binary_oarchive.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -90,8 +84,4 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_BINARY_OARCHIVE_IMPL_HPP

Modified: branches/release/boost/archive/codecvt_null.hpp
==============================================================================
--- branches/release/boost/archive/codecvt_null.hpp	(original)
+++ branches/release/boost/archive/codecvt_null.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -35,11 +35,6 @@
 } // namespace
 #endif
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -92,9 +87,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
 #include <boost/archive/detail/abi_suffix.hpp> // pop pragmas
 
 #endif //BOOST_ARCHIVE_CODECVT_NULL_HPP

Modified: branches/release/boost/archive/detail/basic_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_iarchive.hpp	(original)
+++ branches/release/boost/archive/detail/basic_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -20,8 +20,6 @@
 // #include <boost/scoped_ptr.hpp>
 
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
-
 #include <boost/type_traits/broken_compiler_spec.hpp>
 #include <boost/serialization/tracking_enum.hpp>
 #include <boost/archive/basic_archive.hpp>
@@ -41,8 +39,7 @@
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;
 //////////////////////////////////////////////////////////////////////
 // class basic_iarchive - read serialized objects from a input stream
-class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive :
-    private boost::noncopyable
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive 
 {
     friend class basic_iarchive_impl;
     // hide implementation of this class to minimize header conclusion

Modified: branches/release/boost/archive/detail/basic_iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_iserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -24,12 +24,8 @@
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
+
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -85,10 +81,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_DETAIL_BASIC_ISERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_oarchive.hpp	(original)
+++ branches/release/boost/archive/detail/basic_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -16,10 +16,8 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <cstddef> // NULL
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
-
+#include <cstddef> // NULL
 #include <boost/type_traits/broken_compiler_spec.hpp>
 
 // can't use this - much as I'd like to as borland doesn't support it
@@ -43,8 +41,7 @@
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;
 //////////////////////////////////////////////////////////////////////
 // class basic_oarchive - write serialized objects to an output stream
-class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oarchive :
-    private boost::noncopyable
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oarchive
 {
     friend class basic_oarchive_impl;
     // hide implementation of this class to minimize header conclusion

Modified: branches/release/boost/archive/detail/basic_oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_oserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -18,19 +18,14 @@
 
 #include <cstddef> // NULL
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
 
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/basic_serializer.hpp>
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
+
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -83,10 +78,6 @@
 } // namespace serialization
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_SERIALIZATION_BASIC_OSERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_pointer_iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_pointer_iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_pointer_iserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -17,18 +17,13 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/basic_serializer.hpp>
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
+
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -64,10 +59,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_POINTER_ISERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_pointer_oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_pointer_oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_pointer_oserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -17,18 +17,13 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/basic_serializer.hpp>
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
+
 namespace serialization {
     class extended_type_info;
 } // namespace serialization
@@ -40,8 +35,7 @@
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;
 
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer : 
-    public basic_serializer
-{
+    public basic_serializer {
 protected:
     explicit basic_pointer_oserializer(
         const boost::serialization::extended_type_info & type_
@@ -63,10 +57,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_BASIC_POINTER_OSERIALIZER_HPP

Modified: branches/release/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer.hpp	(original)
+++ branches/release/boost/archive/detail/basic_serializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -23,11 +23,6 @@
 #include <boost/config.hpp>
 #include <boost/serialization/extended_type_info.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 namespace detail {
@@ -72,8 +67,4 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_BASIC_SERIALIZER_HPP

Modified: branches/release/boost/archive/detail/check.hpp
==============================================================================
--- branches/release/boost/archive/detail/check.hpp	(original)
+++ branches/release/boost/archive/detail/check.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -58,7 +58,7 @@
     // trap attempts to serialize objects marked
     // not_serializable
     BOOST_STATIC_ASSERT(typex::value);
-}
+};
 
 template<class T>
 void inline check_object_versioning(){
@@ -76,7 +76,7 @@
     // trap attempts to serialize with objects that don't
     // save class information in the archive with versioning.
     BOOST_STATIC_ASSERT(typex::value);
-}
+};
 
 template<class T>
 void inline check_object_tracking(){
@@ -96,7 +96,7 @@
     // for motivation for this checking.
 
     BOOST_STATIC_WARNING(typex::value);
-}
+};
 
 // checks for pointers
 
@@ -146,7 +146,7 @@
     // serializing an object of a type marked "track_never" through a pointer
     // could result in creating more objects than were saved!
     BOOST_STATIC_WARNING(typex::value);
-}
+};
 
 template<class T>
 void inline check_const_loading(){
@@ -160,7 +160,7 @@
     // cannot load data into a "const" object unless it's a
     // wrapper around some other non-const object.
     BOOST_STATIC_ASSERT(typex::value);
-}
+};
 
 } // detail
 } // archive

Modified: branches/release/boost/archive/detail/common_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/common_iarchive.hpp	(original)
+++ branches/release/boost/archive/detail/common_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -16,19 +16,12 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config.hpp>
-
 #include <boost/archive/detail/basic_iarchive.hpp>
 #include <boost/archive/detail/basic_pointer_iserializer.hpp>
 #include <boost/archive/detail/interface_iarchive.hpp>
 #include <boost/archive/detail/archive_serializer_map.hpp>
 #include <boost/serialization/singleton.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 namespace detail {
@@ -89,9 +82,5 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_DETAIL_COMMON_IARCHIVE_HPP
 

Modified: branches/release/boost/archive/detail/common_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/detail/common_oarchive.hpp	(original)
+++ branches/release/boost/archive/detail/common_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -16,16 +16,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/config.hpp>
-
 #include <boost/archive/detail/basic_oarchive.hpp>
 #include <boost/archive/detail/interface_oarchive.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 namespace detail {
@@ -80,8 +73,4 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_DETAIL_COMMON_OARCHIVE_HPP

Modified: branches/release/boost/archive/detail/iserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/iserializer.hpp	(original)
+++ branches/release/boost/archive/detail/iserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -110,11 +110,6 @@
 
 namespace detail {
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class Archive, class T>
 class iserializer : public basic_iserializer
 {
@@ -158,10 +153,6 @@
     virtual ~iserializer(){};
 };
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
 template<class Archive, class T>
 BOOST_DLLEXPORT void iserializer<Archive, T>::load_object_data(
     basic_iarchive & ar,
@@ -186,11 +177,6 @@
     );
 }
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class Archive, class T>
 class pointer_iserializer :
     public basic_pointer_iserializer
@@ -212,10 +198,6 @@
     ~pointer_iserializer();
 };
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
 // note trick to be sure that operator new is using class specific
 // version if such exists. Due to Peter Dimov.
 // note: the following fails if T has no default constructor.
@@ -489,7 +471,7 @@
     }
 
     template<class T>
-    static void load(Archive & /* ar */ , T & /* t */){
+    static void load(Archive &ar, T & t){
         check_pointer_level<T>();
         check_pointer_tracking<T>();
     }

Modified: branches/release/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/oserializer.hpp	(original)
+++ branches/release/boost/archive/detail/oserializer.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -91,11 +91,6 @@
 
 namespace detail {
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class Archive, class T>
 class oserializer : public basic_oserializer
 {
@@ -133,10 +128,6 @@
     virtual ~oserializer(){}
 };
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
 template<class Archive, class T>
 BOOST_DLLEXPORT void oserializer<Archive, T>::save_object_data(
     basic_oarchive & ar,    
@@ -152,11 +143,6 @@
     );
 }
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class Archive, class T>
 class pointer_oserializer :
     public basic_pointer_oserializer
@@ -177,10 +163,6 @@
     ~pointer_oserializer();
 };
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
 template<class Archive, class T>
 BOOST_DLLEXPORT void pointer_oserializer<Archive, T>::save_object_ptr(
     basic_oarchive & ar,
@@ -306,13 +288,13 @@
             > > >::type typex; 
         check_object_versioning<T>();
         typex::invoke(ar, t);
-    }
+    };
     template<class T>
     static void invoke(Archive & ar, T & t){
         check_object_level<T>();
         check_object_tracking<T>();
         invoke(ar, const_cast<const T &>(t));
-    }
+    };
 };
 
 template<class Archive>
@@ -471,7 +453,7 @@
             return;
         }
         save(ar, * t);
-    }
+    };
 };
 
 template<class Archive>

Modified: branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp
==============================================================================
--- branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp	(original)
+++ branches/release/boost/archive/detail/polymorphic_iarchive_route.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -27,6 +27,7 @@
 } // namespace std
 #endif
 
+#include <boost/noncopyable.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/archive/polymorphic_iarchive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -41,17 +42,13 @@
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer;
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class ArchiveImplementation>
 class polymorphic_iarchive_route :
     public polymorphic_iarchive,
     // note: gcc dynamic cross cast fails if the the derivation below is
     // not public.  I think this is a mistake.
-    public /*protected*/ ArchiveImplementation
+    public /*protected*/ ArchiveImplementation,
+    private boost::noncopyable
 {
 private:
     // these are used by the serialization library.
@@ -191,10 +188,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_IARCHIVE_DISPATCH_HPP

Modified: branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp
==============================================================================
--- branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp	(original)
+++ branches/release/boost/archive/detail/polymorphic_oarchive_route.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -18,6 +18,7 @@
 
 #include <string>
 #include <ostream>
+#include <boost/noncopyable.hpp>
 #include <boost/cstdint.hpp>
 #include <cstddef> // size_t
 
@@ -41,17 +42,13 @@
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;
 class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 template<class ArchiveImplementation>
 class polymorphic_oarchive_route :
     public polymorphic_oarchive,
     // note: gcc dynamic cross cast fails if the the derivation below is
     // not public.  I think this is a mistake.
-    public /*protected*/ ArchiveImplementation
+    public /*protected*/ ArchiveImplementation,
+    private boost::noncopyable
 {
 private:
     // these are used by the serialization library.
@@ -182,10 +179,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_DETAIL_POLYMORPHIC_OARCHIVE_DISPATCH_HPP

Modified: branches/release/boost/archive/impl/archive_serializer_map.ipp
==============================================================================
--- branches/release/boost/archive/impl/archive_serializer_map.ipp	(original)
+++ branches/release/boost/archive/impl/archive_serializer_map.ipp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -21,21 +21,12 @@
 namespace archive {
 namespace detail {
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace { // anon
     template<class Archive>
     class map : public basic_serializer_map 
     {};
 }
 
-#ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
 template<class Archive>
 BOOST_ARCHIVE_OR_WARCHIVE_DECL(bool)
 archive_serializer_map<Archive>::insert(const basic_serializer * bs){

Modified: branches/release/boost/archive/iterators/escape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/escape.hpp	(original)
+++ branches/release/boost/archive/iterators/escape.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -97,7 +97,7 @@
     const base_value_type *m_bnext;
     const base_value_type *m_bend;
     bool m_full;
-    base_value_type m_current_value;
+    BOOST_DEDUCED_TYPENAME boost::iterator_value<Base>::type m_current_value;
 public:
     escape(Base base) : 
         super_t(base),

Modified: branches/release/boost/archive/iterators/istream_iterator.hpp
==============================================================================
--- branches/release/boost/archive/iterators/istream_iterator.hpp	(original)
+++ branches/release/boost/archive/iterators/istream_iterator.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -61,7 +61,7 @@
 
     void increment(){
         if(NULL != m_istream){
-            m_current_value = static_cast<Elem>(m_istream->get());
+            m_current_value = m_istream->get();
             if(! m_istream->good()){
                 const_cast<this_t *>(this)->m_istream = NULL;
             }

Modified: branches/release/boost/archive/iterators/unescape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/unescape.hpp	(original)
+++ branches/release/boost/archive/iterators/unescape.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -50,11 +50,13 @@
     > super_t;
 
     typedef unescape<Derived, Base> this_t;
+    typedef BOOST_DEDUCED_TYPENAME super_t::reference reference_type;
 public:
-    typedef BOOST_DEDUCED_TYPENAME this_t::value_type value_type;
-    typedef BOOST_DEDUCED_TYPENAME this_t::reference reference;
+    // gcc 3.4.1 - linux required that this be public
+    typedef BOOST_DEDUCED_TYPENAME super_t::value_type value_type;
 private:
-    value_type dereference_impl() {
+
+    reference_type dereference_impl() {
         if(! m_full){
             m_current_value = static_cast<Derived *>(this)->drain();
             m_full = true;
@@ -62,10 +64,11 @@
         return m_current_value;
     }
 
-    reference dereference() const {
+    reference_type dereference() const {
         return const_cast<this_t *>(this)->dereference_impl();
     }
 
+    // value_type is const char - can't be const fix later
     value_type m_current_value;
     bool m_full;
 

Modified: branches/release/boost/archive/iterators/xml_unescape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_unescape.hpp	(original)
+++ branches/release/boost/archive/iterators/xml_unescape.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -19,8 +19,6 @@
 #include <cassert>
 
 #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
-#include <boost/detail/workaround.hpp>
-
 #include <boost/serialization/throw_exception.hpp>
 #include <boost/serialization/pfto.hpp>
 
@@ -46,15 +44,8 @@
         return unescape<xml_unescape<Base>, Base>::dereference();
     }
 public:
-    // workaround msvc 7.1 ICU crash
-    #if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1400)
-        typedef int value_type;
-    #else
-        typedef BOOST_DEDUCED_TYPENAME this_t::value_type value_type;
-    #endif
-
     void drain_residue(const char *literal);
-    value_type drain();
+    int drain();
 
     template<class T>
     xml_unescape(BOOST_PFTO_WRAPPER(T) start) : 
@@ -84,10 +75,8 @@
 // iterator refenence which would make subsequent iterator comparisons
 // incorrect and thereby break the composiblity of iterators.
 template<class Base>
-BOOST_DEDUCED_TYPENAME xml_unescape<Base>::value_type 
-//int 
-xml_unescape<Base>::drain(){
-    value_type retval = * this->base_reference();
+int xml_unescape<Base>::drain(){
+    int retval = * this->base_reference();
     if('&' != retval){
         return retval;
     }

Modified: branches/release/boost/archive/polymorphic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_binary_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_binary_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -20,11 +20,6 @@
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -41,10 +36,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(
     boost::archive::polymorphic_binary_iarchive

Modified: branches/release/boost/archive/polymorphic_text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -20,11 +20,6 @@
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -41,10 +36,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(
     boost::archive::polymorphic_text_iarchive

Modified: branches/release/boost/archive/polymorphic_text_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_text_wiarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_text_wiarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -24,11 +24,6 @@
 #include <boost/archive/text_wiarchive.hpp>
 #include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -45,10 +40,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(
     boost::archive::polymorphic_text_wiarchive

Modified: branches/release/boost/archive/polymorphic_xml_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/polymorphic_xml_iarchive.hpp	(original)
+++ branches/release/boost/archive/polymorphic_xml_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -20,11 +20,6 @@
 #include <boost/archive/xml_iarchive.hpp>
 #include <boost/archive/detail/polymorphic_iarchive_route.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -41,10 +36,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(
     boost::archive::polymorphic_xml_iarchive

Modified: branches/release/boost/archive/text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_iarchive.hpp	(original)
+++ branches/release/boost/archive/text_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -26,11 +26,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -99,10 +94,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 // note special treatment of shared_ptr. This type needs a special
@@ -111,11 +102,6 @@
 // special esteem in the boost library - we included it here by default.
 #include <boost/archive/shared_ptr_helper.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -137,8 +123,4 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::text_iarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_TEXT_IARCHIVE_HPP

Modified: branches/release/boost/archive/text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_oarchive.hpp	(original)
+++ branches/release/boost/archive/text_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -33,11 +33,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -87,6 +82,7 @@
     public text_oarchive_impl<text_oarchive>
 {
 public:
+     
     text_oarchive(std::ostream & os_, unsigned int flags = 0) :
         // note: added _ to suppress useless gcc warning
         text_oarchive_impl<text_oarchive>(os_, flags)
@@ -102,10 +98,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::text_oarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_TEXT_OARCHIVE_HPP

Modified: branches/release/boost/archive/text_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_wiarchive.hpp	(original)
+++ branches/release/boost/archive/text_wiarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -30,11 +30,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -96,10 +91,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 // note special treatment of shared_ptr. This type needs a special
@@ -108,11 +99,6 @@
 // special esteem in the boost library - we included it here by default.
 #include <boost/archive/shared_ptr_helper.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -133,9 +119,5 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::text_wiarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_NO_STD_WSTREAMBUF
 #endif // BOOST_ARCHIVE_TEXT_WIARCHIVE_HPP

Modified: branches/release/boost/archive/text_woarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_woarchive.hpp	(original)
+++ branches/release/boost/archive/text_woarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -38,11 +38,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -88,7 +83,7 @@
     }
 public:
     void save_binary(const void *address, std::size_t count){
-        put(static_cast<wchar_t>('\n'));
+        put(L'\n');
         this->end_preamble();
         #if ! defined(__MWERKS__)
         this->basic_text_oprimitive<std::wostream>::save_binary(
@@ -98,7 +93,7 @@
             address, 
             count
         );
-        put(static_cast<wchar_t>('\n'));
+        put(L'\n');
         this->delimiter = this->none;
     }
 
@@ -128,10 +123,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::text_woarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_NO_STD_WSTREAMBUF

Modified: branches/release/boost/archive/xml_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_iarchive.hpp	(original)
+++ branches/release/boost/archive/xml_iarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -26,11 +26,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -107,10 +102,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 // note special treatment of shared_ptr. This type needs a special
@@ -119,11 +110,6 @@
 // special esteem in the boost library - we included it here by default.
 #include <boost/archive/shared_ptr_helper.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -144,8 +130,4 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::xml_iarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_ARCHIVE_XML_IARCHIVE_HPP

Modified: branches/release/boost/archive/xml_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_oarchive.hpp	(original)
+++ branches/release/boost/archive/xml_oarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -33,11 +33,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -115,10 +110,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::xml_oarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_ARCHIVE_XML_OARCHIVE_HPP

Modified: branches/release/boost/archive/xml_wiarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_wiarchive.hpp	(original)
+++ branches/release/boost/archive/xml_wiarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -31,11 +31,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -111,11 +106,6 @@
 } // namespace archive
 } // namespace boost
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 // note special treatment of shared_ptr. This type needs a special
@@ -124,11 +114,6 @@
 // special esteem in the boost library - we included it here by default.
 #include <boost/archive/shared_ptr_helper.hpp>
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost { 
 namespace archive {
 
@@ -149,9 +134,5 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::xml_wiarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #endif // BOOST_NO_STD_WSTREAMBUF
 #endif // BOOST_ARCHIVE_XML_WIARCHIVE_HPP

Modified: branches/release/boost/archive/xml_woarchive.hpp
==============================================================================
--- branches/release/boost/archive/xml_woarchive.hpp	(original)
+++ branches/release/boost/archive/xml_woarchive.hpp	2009-11-16 00:27:58 EST (Mon, 16 Nov 2009)
@@ -37,11 +37,6 @@
 
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4511 4512)
-#endif
-
 namespace boost {
 namespace archive {
 
@@ -129,10 +124,6 @@
 // required by export
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(boost::archive::xml_woarchive)
 
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
-
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 
 #endif // BOOST_NO_STD_WSTREAMBUF