Quickbook: Merge from trunk.

Includes blocks in lists fixes, and some documentation changes. [SVN r77347]
Quickbook: Merge to quickbook-dev
2026-07-21 13:33:32 +00:00 · 2012-03-16 08:48:10 +00:00 · 2012-01-21 21:43:17 +00:00 · 2011-11-01 13:04:29 +00:00 · 2011-11-01 13:03:44 +00:00 · 2011-03-27 10:17:05 +00:00
470 changed files with 36559 additions and 9240 deletions
@@ -1,72 +0,0 @@
-# Copyright 2016 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-language: cpp
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-branches:
-  only:
-    - master
-    - develop
-
-install:
-  - cd ..
-  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-  - cd boost-root
-  - git submodule init libs/align
-  - git submodule init libs/array
-  - git submodule init libs/assert
-  - git submodule init libs/bind
-  - git submodule init libs/compatibility
-  - git submodule init libs/concept_check
-  - git submodule init libs/config
-  - git submodule init libs/container
-  - git submodule init libs/core
-  - git submodule init libs/detail
-  - git submodule init libs/filesystem
-  - git submodule init libs/function
-  - git submodule init libs/functional
-  - git submodule init libs/integer
-  - git submodule init libs/intrusive
-  - git submodule init libs/io
-  - git submodule init libs/iterator
-  - git submodule init libs/lexical_cast
-  - git submodule init libs/math
-  - git submodule init libs/move
-  - git submodule init libs/mpl
-  - git submodule init libs/numeric/conversion
-  - git submodule init libs/optional
-  - git submodule init libs/predef
-  - git submodule init libs/preprocessor
-  - git submodule init libs/range
-  - git submodule init libs/smart_ptr
-  - git submodule init libs/spirit
-  - git submodule init libs/static_assert
-  - git submodule init libs/system
-  - git submodule init libs/throw_exception
-  - git submodule init libs/tuple
-  - git submodule init libs/type_index
-  - git submodule init libs/type_traits
-  - git submodule init libs/unordered
-  - git submodule init libs/utility
-  - git submodule init libs/variant
-  - git submodule init tools/build
-  - git submodule update --depth 1
-  - cp -r $TRAVIS_BUILD_DIR/* libs/serialization
-  - ./bootstrap.sh
-  - ./b2 headers
-
-script:
-  - TOOLSET=gcc,clang
-  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
-  - ./b2 libs/serialization/test toolset=$TOOLSET
-
-notifications:
-  email:
-    on_success: always
@@ -1,417 +0,0 @@
-# CMake build control file for Serialization Library tests
-
-cmake_minimum_required(VERSION 3.0)
-
-if (POLICY CMP0054)
-  cmake_policy (SET CMP0054 NEW)
-endif (POLICY CMP0054)
-
-if (POLICY CMP0063)
-  cmake_policy (SET CMP0063 NEW)
-endif (POLICY CMP0063)
-
-if(Boost_USE_STATIC_LIBS)
-  project("Serialization-Static")
-else()
-  project("Serialization-Shared")
-endif()
-
-#
-# Compiler settings
-#
-
-message(STATUS "compiler is ${CMAKE_CXX_COMPILER_ID}" )
-add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
-
-if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-  add_definitions( -ftemplate-depth=300 )
-  # we use gcc to test for C++03 compatibility
-  add_definitions( std=c++03 )
-  message(STATUS "compiler is g++ c++03")
-  set(COMPILER_SUPPORTS_CXX11 FALSE)
-elseif( CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" )
-  add_definitions( /wd4996 )
-  message(STATUS "compiler is MSVC")
-  set(COMPILER_SUPPORTS_CXX11 TRUE)
-elseif( CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" )
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=300")
-  #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0" )
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3" )
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -dead_strip")
-  set(COMPILER_SUPPORTS_CXX11 TRUE)
-endif()
-
-#
-# IDE settings
-#
-
-if( CMAKE_HOST_APPLE )
-  # note: it seems that bjam builds both address models in any case
-  # so we can defer this decision to the IDE just as we do for debug/release
-  # so we'll not use this now
-  # set(Boost_ADDRESS_MODEL 64 CACHE INTEGER "32/64 bits")
-  set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link to Boost static libraries")
-  set(Boost_USE_MULTITHREADED ON)
-else()
-  set(Boost_ADDRESS_MODEL 64 CACHE INTEGER "32/64 bits")
-  set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link to Boost static libraries")
-  set(Boost_USE_MULTITHREADED ON)
-endif()
-
-#
-# Locate Project Prerequisites 
-#
-
-# Boost
-
-# note: we're assuming that boost has been built with:
-# ./b2 —-layout=versioned toolset=clang-darwin link=static,shared variant=debug,release stage
-
-###########################
-# special notes for Xcode.
-
-# these three should result in CMake setting the variables
-# Boost_SERIALIZATION_LIBRARY_DEBUG … to the correct values.  
-
-# But my current version of CMake doesn't automatically set the library names
-# to point to the the libraries to be used.  The variables are created
-# but they are not initialized.  So be prepared to set these variables by hand.
-# If you want to use the static libraries - point to the boost libraries ending
-# in ".a".  If you want to use the shared boost libraries - point to the libraries
-# ending in ".dylib".
-
-# But wait - there's more.
-# if both lib.a and lib.dylib both exist in the library directory, Xcode will
-# automatically chose the *.dylib one - and there's nothing you can do to fix this.
-# So my recommendation is 
-# a) to place the compiled libraries in two different directories
-#    - e.g. stage/lib-static/*.a and stage/lib-shared/*.dylib
-#    and set the CMake variable Boost_LIBRARY_DIR to point to one or the other
-# b) create two different CMake build directories - build-static and build-shared
-#    and switch between projects as desired.  I like to test both since
-#    there are things like dead code elimination and visibility which vary
-#    between the two environments.
-#
-#    caveat - as I write this, I've been unable to get the tests on the shared
-#    library to function. Problem is that one needs to either put the shared
-#    libraries in a special known place or set an environmental
-#    variable which points to the shared library directory.  I prefer the latter
-#    but I've been unable to figure out how to get Xcode to do on a global basis
-#    and it's not practical to do this for 247 test targets one at a time.
-
-# c) The targets in the project will by default be built as universal 32/64 binaries
-#    I have yet to experiment with these yet so I just set the target to 64 bit.
-
-# end special note for Xcode
-############################
-
-set(Boost_DEBUG true)
-set(Boost_DETAILED_FAILURE_MSG true)
-set(Boost_FOUND true)
-
-find_package(Boost REQUIRED COMPONENTS system filesystem)
-
-message(STATUS "Boost_FOUND is ${Boost_FOUND}")
-
-if(Boost_FOUND)
-    message(STATUS "Boost Found!")
-    message(STATUS "Boost is ${BOOST_ROOT}")
-    message(STATUS "Boost directories found at ${Boost_INCLUDE_DIRS}")
-    message(STATUS "Boost libraries found at ${Boost_LIBRARY_DIRS}")
-    message(STATUS "Boost libraries prefix is  ${Boost_LIB_PREFIX}")
-    message(STATUS "Boost component libraries to be linked are ${Boost_LIBRARIES}")
-    message(STATUS "Boost version found is ${Boost_VERSION}")
-    #include_directories("../include" "${Boost_INCLUDE_DIRS}")
-    #link_directories("${Boost_LIBRARY_DIRS}")
-else()
-    message(STATUS "Boost NOT Found!")
-endif()
-
-if(Boost_USE_STATIC_LIBS)
-  message(STATUS "Use static libraries")
-  set(LINK_TYPE "STATIC")
-else()
-  message(STATUS "Building shared libraries")
-  set(LINK_TYPE "SHARED")
-  add_definitions( "-DBOOST_ALL_DYN_LINK=1")
-  add_definitions( "-DBOOST_ALL_NO_LIB=1")
-  add_definitions( "-DBOOST_LIB_DIAGNOSTICS=1")
-  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-  set(VISIBILITY_INLINES_HIDDEN)
-endif()
-
-###########################
-# library builds
-
-add_library(serialization ${LINK_TYPE}
-  ../src/archive_exception.cpp
-  ../src/basic_archive.cpp
-  ../src/basic_iarchive.cpp
-  ../src/basic_iserializer.cpp
-  ../src/basic_oarchive.cpp
-  ../src/basic_oserializer.cpp
-  ../src/basic_pointer_iserializer.cpp
-  ../src/basic_pointer_oserializer.cpp
-  ../src/basic_serializer_map.cpp
-  ../src/basic_text_iprimitive.cpp
-  ../src/basic_text_oprimitive.cpp
-  ../src/basic_xml_archive.cpp
-  ../src/binary_iarchive.cpp
-  ../src/binary_oarchive.cpp
-  ../src/extended_type_info_no_rtti.cpp
-  ../src/extended_type_info_typeid.cpp
-  ../src/extended_type_info.cpp
-  ../src/polymorphic_iarchive.cpp
-  ../src/polymorphic_oarchive.cpp
-  ../src/singleton.cpp
-  ../src/stl_port.cpp
-  ../src/text_iarchive.cpp
-  ../src/text_oarchive.cpp
-  ../src/void_cast.cpp
-  ../src/xml_archive_exception.cpp
-  ../src/xml_iarchive.cpp
-  ../src/xml_oarchive.cpp
-  ../src/xml_grammar.cpp
-  ../src/utf8_codecvt_facet.cpp
-  ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
-)
-
-add_library(wserialization  ${LINK_TYPE}
-  ../src/codecvt_null.cpp
-  ../src/basic_text_wiprimitive.cpp
-  ../src/basic_text_woprimitive.cpp
-  ../src/text_wiarchive.cpp
-  ../src/text_woarchive.cpp
-  ../src/xml_wiarchive.cpp
-  ../src/xml_woarchive.cpp
-  ../src/xml_wgrammar.cpp
-  ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
-)
-
-# end library build
-###########################
-
-###########################
-# test targets
-
-function( serialization_test test_name)
-  set(arglist)
-  foreach(a IN ITEMS ${ARGN} )
-    set(arglist ${arglist} ../test/${a}.cpp)
-  endforeach()
-  message(STATUS ${test_name})
-  add_executable( ${test_name} ../test/${test_name}.cpp ${arglist} )
-  target_link_libraries(${test_name} serialization wserialization ${Boost_LIBRARIES})
-  add_test( ${test_name} ${test_name} )
-endfunction(serialization_test)
-
-function(archive_test test_name)
-  set(arglist)
-  foreach(a IN ITEMS ${ARGN} )
-    set(arglist ${arglist} ../test/${a}.cpp)
-  endforeach()
-  foreach(
-    archive-name
-    IN ITEMS text_archive text_warchive binary_archive xml_archive xml_warchive
-  )
-    set(amended_test_name ${test_name}_${archive-name})
-    message(STATUS ${amended_test_name})
-    add_executable(${amended_test_name} ../test/${test_name}.cpp ${arglist})
-    set_property(
-      TARGET ${amended_test_name}
-      PROPERTY COMPILE_DEFINITIONS BOOST_ARCHIVE_TEST=${archive-name}.hpp
-    )
-    target_link_libraries(${amended_test_name} serialization wserialization ${Boost_LIBRARIES})
-    add_test(${amended_test_name} ${amended_test_name})
-  endforeach()
-endfunction(archive_test)
-
-function(polymorphic_archive_test test_name)
-  set(arglist)
-  foreach(a IN ITEMS ${ARGN} )
-    set(arglist ${arglist} ../test/${a}.cpp)
-  endforeach()
-  foreach(
-    archive-name
-    IN ITEMS text_archive text_warchive binary_archive xml_archive xml_warchive
-  )
-    set(amended_test_name ${test_name}_polymorphic_${archive-name})
-    message(STATUS ${amended_test_name})
-    add_executable(${amended_test_name} ../test/${test_name}.cpp ${arglist})
-    set_property(
-      TARGET ${amended_test_name}
-      PROPERTY COMPILE_DEFINITIONS BOOST_ARCHIVE_TEST=polymorphic_${archive-name}.hpp
-    )
-    target_link_libraries(${amended_test_name} serialization wserialization ${Boost_LIBRARIES})
-    add_test(${amended_test_name} ${amended_test_name})
-  endforeach()
-endfunction(polymorphic_archive_test)
-
-enable_testing()
-
-# serialization(test_dll_exported dll_polymorphic_derived2_lib)
-# serialization(test_dll_simple dll_a_lib)
-# compile test_dll_plugin.cpp
-# Running the following test requires that the test know the directory 
-# in which the dll is stored. I don't know how to extract this from bjam
-# serialization(test_dll_plugin : : dll_polymorphic_derived2_lib)
-
-serialization_test(test_private_ctor)
-serialization_test(test_reset_object_address A)
-serialization_test(test_void_cast)
-serialization_test(test_mult_archive_types)
-serialization_test(test_iterators)
-serialization_test(test_iterators_base64)
-serialization_test(test_inclusion)
-serialization_test(test_smart_cast)
-serialization_test(test_codecvt_null ../src/codecvt_null)
-serialization_test(test_strong_typedef)
-
-archive_test(test_native_array A)
-archive_test(test_boost_array A)
-if(COMPILER_SUPPORTS_CXX11)
-  archive_test(test_array A)
-endif()
-archive_test(test_binary)
-archive_test(test_bitset)
-archive_test(test_class_info_save)
-archive_test(test_class_info_load)
-archive_test(test_complex)
-archive_test(test_contained_class A)
-archive_test(test_cyclic_ptrs A)
-archive_test(test_delete_pointer)
-archive_test(test_deque A)
-archive_test(test_derived)
-archive_test(test_derived_class A)
-archive_test(test_diamond)
-archive_test(test_diamond_complex)
-archive_test(test_exported polymorphic_base)
-archive_test(test_forward_list A)
-archive_test(test_forward_list_ptrs A)
-archive_test(test_helper_support)
-archive_test(test_interrupts)
-archive_test(test_list A)
-archive_test(test_list_ptrs A)
-archive_test(test_map A)
-archive_test(test_map_boost_unordered A)
-archive_test(test_mi)
-archive_test(test_multiple_ptrs A)
-archive_test(test_multiple_inheritance)
-archive_test(test_no_rtti polymorphic_base polymorphic_derived1)
-archive_test(test_new_operator A)
-archive_test(test_non_intrusive)
-archive_test(test_non_default_ctor)
-archive_test(test_non_default_ctor2)
-archive_test(test_null_ptr)
-archive_test(test_nvp A)
-archive_test(test_object)
-archive_test(test_optional)
-archive_test(test_primitive)
-archive_test(test_priority_queue A)
-archive_test(test_private_base)
-archive_test(test_private_base2)
-archive_test(test_queue A)
-archive_test(test_recursion A)
-archive_test(test_registered)
-archive_test(test_shared_ptr)
-archive_test(test_shared_ptr_multi_base)
-archive_test(test_shared_ptr_132)
-archive_test(test_simple_class A)
-archive_test(test_simple_class_ptr A)
-archive_test(test_stack A)
-archive_test(test_split)
-archive_test(test_tracking)
-archive_test(test_unregistered)
-archive_test(test_unique_ptr)
-archive_test(test_valarray)
-archive_test(test_variant A)
-archive_test(test_vector A)
-archive_test(test_set A)
-archive_test(test_set_boost_unordered A)
-if(COMPILER_SUPPORTS_CXX11)
-  archive_test(test_set_unordered A)
-else()
-  archive_test(test_set_hashed A)
-endif()
-if(COMPILER_SUPPORTS_CXX11)
-  archive_test(test_map_unordered A)
-else()
-  archive_test(test_map_hashed A)
-endif()
-
-polymorphic_archive_test(test_polymorphic test_polymorphic_A A)
-polymorphic_archive_test(test_polymorphic2 test_polymorphic2imp)
-polymorphic_archive_test(test_polymorphic_helper)
-
-# end test targets
-####################
-
-####################
-# add headers in IDE
-
-# for serialisation
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/archive/*.hpp"
-)
-add_custom_target(archive SOURCES ${x})
-set_property(TARGET archive PROPERTY FOLDER "serialization")
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/archive/detail/*.hpp"
-)
-add_custom_target(archive-detail SOURCES ${x})
-set_property(TARGET archive-detail PROPERTY FOLDER "serialization")
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/archive/impl/*.ipp"
-)
-add_custom_target(archive-impl SOURCES ${x})
-set_property(TARGET archive-impl PROPERTY FOLDER "serialization")
-
-file(GLOB x
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/archive/iterators/*.hpp"
-)
-add_custom_target(archive-iterators SOURCES ${x})
-set_property(TARGET archive-iterators PROPERTY FOLDER "serialization")
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/serialization/*.hpp"
-)
-add_custom_target(serialization-headers SOURCES ${x})
-set_property(TARGET serialization-headers PROPERTY FOLDER "serialization")
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/serialization/detail/*.hpp"
-)
-add_custom_target(serialization-detail SOURCES ${x})
-set_property(TARGET serialization-detail PROPERTY FOLDER "serialization")
-
-# for wserialization
-
-file(GLOB x 
-  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
-  "${CMAKE_CURRENT_SOURCE_DIR}/../include/boost/archive/*_w*.hpp"
-)
-add_custom_target(wserialization_headers SOURCES ${x})
-set_property(TARGET wserialization_headers PROPERTY FOLDER "wserialization")
-
-# end headers in IDE
-####################
-
-#####################
-# add test project to run misc tests
-
-add_executable( test_z ../test/test_z.cpp)
-target_link_libraries(test_z serialization wserialization ${Boost_LIBRARIES})
-
-# end test project
-#####################
@@ -80,9 +80,7 @@ SOURCES =
    xml_iarchive
    xml_oarchive
    xml_archive_exception
-    codecvt_null
-    utf8_codecvt_facet
-    singleton
+    shared_ptr_helper
 ;
    
 WSOURCES = 
@@ -90,22 +88,19 @@ WSOURCES =
    basic_text_woprimitive
    text_wiarchive
    text_woarchive
+    utf8_codecvt_facet
    xml_wgrammar
    xml_wiarchive
    xml_woarchive
+    codecvt_null
 ;

+
 lib boost_serialization 
    : $(SOURCES).cpp
    : 
    <toolset>msvc:<cxxflags>/Gy
-    <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
-    <toolset>clang:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>gcc:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>darwin:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>gcc:<cxxflags>"-ftemplate-depth-255"
-    <toolset>clang:<cxxflags>"-ftemplate-depth-255"
-    <toolset>darwin:<cxxflags>"-ftemplate-depth-255"
+    #<toolset>gcc:<cxxflags>"-fvisibility=hidden"
    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
    ;

@@ -113,15 +108,7 @@ lib boost_wserialization
    : $(WSOURCES).cpp boost_serialization 
    :     
    <toolset>msvc:<cxxflags>/Gy 
-    <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
-    <toolset>clang:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>gcc:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>darwin:<cxxflags>"-fvisibility=hidden -fvisibility-inlines-hidden"
-    <toolset>gcc:<cxxflags>"-ftemplate-depth-255"
-    <toolset>clang:<cxxflags>"-ftemplate-depth-255"
-    <toolset>darwin:<cxxflags>"-ftemplate-depth-255"
-    # note: both serialization and wserialization are conditioned on the this
-    # switch - don't change it to BOOST_WSERIALIZATION_DYN_LINK
+    #<toolset>gcc:<cxxflags>"-fvisibility=hidden"
    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
    ;

@@ -44,10 +44,10 @@ http://www.boost.org/LICENSE_1_0.txt)
  <li>Tonko Juricic helped refine and complete project files for VC 7.1 ide
  <li><a href="http://www.boost.org/people/rene_rivera.htm">Rene Rivera</a> tracked down several issues related to 
  Code Warrior, toolset configuration and bjam and much else.
-  <li>Martin Ecker detected (and fixed!) a number of subtle errors regarding cyclic
+  <li>Martin Ecker detected (and fixed!) a number of sublte errors regarding cyclic
  pointers, shared pointers.  He also built the library as a DLL and raised some issues
  <li>Pavel Vozenilek invested much effort in review of code and documentation
-  resulting in many improvements.  In addition he helped a lot with porting to other
+  resulting in many improvements.  In addition he help a lot with porting to other
  platforms including VC 6.0, Intel, and especially Borland.
  <li><a href="http://www.boost.org/people/jens_maurer.htm">Jens Maurer</a> and
  <a href="http://www.boost.org/people/beman_dawes.html">Beman Dawes</a> who got the boost
@@ -76,7 +76,7 @@ http://www.boost.org/LICENSE_1_0.txt)
  Mr. Rozenthal in particular wrote an incredibly insightful analysis
  that has driven all subsequent development that has resulted in the
  current package.
-  <li>Dave Harris proposal and spirited defense of it led to a re-thinking
+  <li>Dave Harris proposal and spirited defense of it lead to a re-thinking
  of the overrides for serialization of pointers.  This resulted in a simpler
  and more effective method of accounting for non-default constructors
  required by serialization of pointers and STL collections.
@@ -35,7 +35,7 @@ http://www.boost.org/LICENSE_1_0.txt)

 <h3><a name="trivial">Trivial Archive</a></h3>
 The <a href="archives.html"><strong>Archive</strong></a> concept specifies the functions that a
-class must implement in order to be used to serialize 
+class must implement to in order to be used to serialize 
 <a href="serialization.html"><strong>Serializable</strong></a> types.

 Our discussion will focus on archives used for saving as the hierarchy is exactly analogous
@@ -57,7 +57,7 @@ public:
    // serialization library
    typedef boost::mpl::bool_&lt;true&gt; is_saving; 
    typedef boost::mpl::bool_&lt;false&gt; is_loading;
-    template&lt;class T&gt; void register_type(){}
+    template&lt;class T&gt; register_type(){}
    template&lt;class T&gt; trivial_oarchive & operator&lt;&lt;(const T & t){
        return *this;
    }
@@ -77,22 +77,22 @@ For an example see
 <a href="../example/demo_trivial_archive.cpp" target="demo_trivial_archive">
 <code style="white-space: normal">demo_trivial_archive.cpp</code></a>.
 Of course this program won't produce any output as it is.  But it provides
-the starting point for a simple class which can be used to log formatted
+the starting point for a simple class which can be used to log formated
 output.  See the implementation of a <a href="simple_log.html">simple
 log archive</a> to how this has been done.

 <h3><a name="implementation">More Useful Archive Classes</a></h3>
 The above example is fine as far as it goes.  But it doesn't implement
 useful features such as serialization of pointers, class versioning
-and others. This library implements a family of full featured archive
+and others. This library implements a family of full featuared archive
 classes appropriate for a variety of purposes.  

 <p>
-Our archives have been factored into a tree of classes in order to minimize
+Our archives have been factored in to a tree of classes in order to minimize
 repetition of code.  This is shown in the accompanying 
 <a target="class_diagram" href="class_diagram.html">class diagram</a>.

-Any class which fulfills the following requirements will fit into
+Any class which fullfills the following requirements will fit into
 this hierarchy and implement all the features we require.  Deriving from
 the base class <a href="../../../boost/archive/detail/common_oarchive.hpp" target="common_oarchive_hpp">
 common_oarchive.hpp</a> provides all features we desire which
@@ -113,7 +113,7 @@ class complete_oarchive :
    friend class boost::archive::save_access;

    // member template for saving primitive types.
-    // Specialize for any types/templates that require special treatment
+    // Specialize for any types/templates that special treatment
    template&lt;class T&gt;
    void save(T &amp; t);

@@ -140,15 +140,15 @@ to help render the archive in a particular form.

 <dl>

-<dt><h4><code>void save_start(char const *)</code></h4></dt>
+<dt><h4><code>void save_start()</code></h4></dt>
 <dd>
 <strong>Default</strong>:Does nothing.<br>
 <strong>Purpose</strong>:To inject/retrieve an object name into the archive.  Used
-by XML archive to inject "&lt;name&gt;" before data.
+by XML archive to inject "&lt;name " before data.
 </dd>
 <p>

-<dt><h4><code>void save_end(char const *)</code></h4></dt>
+<dt><h4><code>void save_end()</code></h4></dt>
 <dd>
 <strong>Default</strong>:Does nothing.<br>
 <strong>Purpose</strong>:To inject/retrieve an object name into the archive. Used
@@ -161,12 +161,12 @@ by XML archive to inject "&lt;/name&gt;" after data.
 <strong>Default</strong>:Does nothing.<br>
 <strong>Purpose</strong>:Called <strong>each time</strong> user data is saved. 
 It's not called when archive bookkeeping data is saved.  This is used by XML archives 
-to determine  when to inject a "&gt;" character at the end of an XML header. XML output archives 
+to determine  when to inject a "&gt;" character at end of XML header. XML output archives 
 keep their own internal flag indicating that data being written is header data. This
 internal flag is reset when an object start tag is written. When 
 <code style="white-space: normal">void end_preamble()</code> is invoked and this internal flag is set
 a "&gt;" character is appended to the output and the internal flag is reset. The default
-implementation for <code style="white-space: normal">void end_preamble()</code> is a no-op thereby permitting it
+implementation for <code style="white-space: normal">void end_preamble()</code> is a no-op there by permitting it
 to be optimised away for archive classes that don't use it.
 </dd>
 <p>
@@ -183,7 +183,7 @@ name-value pairs by overriding this function template for name-value pairs.
 This replaces the default name-value pair handling, which is just to throw away the name,
 with one appropriate for XML which writes out the start of an XML tag with the correct object name.
 <p>
-The second argument must be part of the function signature even though it is not used.
+The second argument must be part of the function signature even this it is not used.
 Its purpose is to be sure that code is portable to compilers which fail to correctly
 implement partial function template ordering.  For more information see
 <a href="implementation.html#functiontemplateordering">this</a>.
@@ -242,7 +242,7 @@ One or more of the following issues may need to be addressed:
    example, XML archives need &lt;name ... &gt;...&lt;/name&gt; surrounding
    all data objects.
    <li>Addressing any of the above may generate more issues to be addressed.
-    <li>The archives included with the library are all templates which use a
+    <li>The archives included with library are all templates which use a
    <code style="white-space: normal">stream</code> or
    <code style="white-space: normal">streambuf</code>
    as a template parameter rather than simple classes.
@@ -281,7 +281,7 @@ exception.
 Exhaustive testing of the library requires testing the different aspects of object
 serialization with each archive.  There are 46 different tests that can run with any archive.  
 There are 5 "standard archives" included with the system. 
-(3 in systems that don't support wide charactor i/o). 
+(3 in systems don't support wide charactor i/o). 
 <p>
 In addition, there are 28 other tests which aren't related to any particular archive class.
 <p>
@@ -354,7 +354,7 @@ each time a new archive class is created.
 </ul>

 <h4>Implementation</h4>
-The solution is the pair <code>polymorphic_oarchive</code>
+The solution is the the pair <code>polymorphic_oarchive</code>
 and <code>polymorphic_iarchive</code>.  They present a common interface of virtual
 functions - no templates - that is equivalent to the standard templated one.

@@ -371,7 +371,7 @@ show how polymorphic archives are to be used. Note the following:
  <li><a target=demo_polymorphic_A_hpp href="../example/demo_polymorphic_A.hpp"><code style="white-space: normal">demo_polymorphic_A.hpp</code></a> and
 <a target=demo_polymorphic_A_cpp href="../example/demo_polymorphic_A.cpp"><code style="white-space: normal">demo_polymorphic_A.cpp</code></a>
 contain no templates and no reference to any specific archive implementation.  That is, they will
-only have to be compiled once for all archive implementations.  This even applies to archives classes
+only have to be compiled once for all archive implementations.  The even applies to archives classes
 created in the future.
  <li>The main program <a target=demo_polymorphic_cp href="../example/demo_polymorphic.cpp"><code style="white-space: normal">demo_polymorphic.cpp</code></a>
 specifies a specific archive implementation.  
@@ -389,7 +389,7 @@ As these contain no code specific to the particular implementation archive, they
 a polymorphic archive implementation from any functioning templated archive implementation.
 <p>
 As a convenience, small header files have been included which contain 
-a <code style="white-space: normal">typedef</code> for a polymorphic implementation for each corresponding
+<code style="white-space: normal">typedef</code> for polymorphic implementation for each corresponding
 templated one.  For example, the headers
 <a target=polymorphic_text_iarchive_hpp href="../../../boost/archive/polymorphic_text_iarchive.hpp"><code style="white-space: normal">polymorphic_text_iarchive.hpp</code></a>
 and
@@ -410,8 +410,8 @@ dispatch table and there is no possibility for a compiler to <code style="white-
 archive functions.  This will result in a detectable degradation in performance for 
 saving and loading archives.
 <p>
-Note that the concept of polymophic archives is fundamentally incompatible with the
-serialization of new types that are marked "primitive" by the user with:
+Note this the concept and of polymophic archives is fundamentally incompatible with the
+serialization of new types are are marked "primitive" by the user with:
 <pre><code> 
 BOOST_CLASS_IMPLEMENTATION(my_primitive_type, boost::serialization::primitive_type)
 </code></pre>
@@ -422,7 +422,7 @@ serialize such a primitive type will result in a compilation error since the com
 interface is static and cannot instantiate code for a new type.

 <p>
-The main utility of polymorphic archives will be to permit the building of class DLLs that will
+The main utility of polymorphic archives will be to permit the buiding of class DLLs that will
 include serialization code for all present and future archives with no redundant code.
 <hr>
 <p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2004. 
@@ -29,13 +29,13 @@
 <h4>Notation</h4>
 In the following descriptions
 <ul>
-  <li><code>SA</code> is an type modeling the <a href="#saving_interface">Saving Archive Concept</a>.
+  <li><code>SA</code> is an type modeling the <a href="#saving_interface">Saving Archive Concept</a>
  <li><code>sa</code> is an instance of type SA.
-  <li><code>LA</code> is an type modeling the <a href="#loading_interface">Loading Archive Concept</a>.
+  <li><code>LA</code> is an type modeling the <a href="#loading_interface">Loading Archive Concept</a>
  <li><code>la</code> is an instance of type LA.
-  <li><code>T</code> is an <a href="serialization.html"><strong>Serializable</strong></a> Type.
-  <li><code>x</code> is an instance of type T Type.
-  <li><code>u,v</code> is a pointer to a an instance of type T.
+  <li><code>T</code> is an <a href="serialization.html"><strong>Serializable</strong></a> Type
+  <li><code>x</code> is an instance of type T Type</li>.
+  <li><code>u,v</code> is a pointer to a an instance of type T
  <li><code>count</code> is an instance of a type that can be converted to <code>std::size_t</code>.
 </ul>
 <h4><a name="saving_interface">Saving Archive Concept</a></h4>
@@ -112,14 +112,6 @@ way the data are rendered <a href="serialization.html">serializable</a>.
    might be conditioned on the library version to make sure that libraries created by 
    previous versions of the library can still be read.
  </dd>
-  <dt><h4><code>
-    sa.get_helper&lt;Helper&gt;(void * const helper_instance_id = 0)
-  </code></h4></dt>
-  <dd>
-    See <code>la.get_helper&lt;Helper&gt;(void * const helper_instance_id = 0)</code>
-    below.
-  </dd>
-
 </dl>

 <h4><a name="loading_interface">Loading Archive Concept</a></h4>
@@ -190,24 +182,6 @@ equivalent to the original.
    The code that loads collections might be conditioned on the library version to make 
    sure that libraries created by previous versions of the library can still be read.
  </dd>
-  <dt><h4><code>
-    la.get_helper&lt;Helper&gt;(void * const helper_instance_id)
-  </code></h4></dt>
-  <dd>
-    Some otherwise unserializable types can be made serializable by inclusion of
-    a helper object.  The iconic example of this is shared_ptr which needs this
-    helper object to keep track of previously loaded shared_ptr instances so they
-    can be "matched up" with subsequently loaded ones.
-    The first time <code  style="white-space: normal">la.get_helper&lt;Helper&gt;(void * const helper_instance_id)</code>
-    is invoked for a given helper_instance_id, <code  style="white-space: normal">Helper</code>, a default-constructed
-    <code style="white-space: normal">Helper</code> object is created, attached to
-    <code  style="white-space: normal">la</code> and a reference to it is returned. Subsequent
-    invocations of <code style="white-space: normal">la.get_helper&lt;Helper&gt;(void * const helper_instance_id)</code> with the same id value return
-    a reference to the formerly constructed object. All objects created in this manner are
-    destroyed  upon <code style="white-space: normal">la</code> destruction time. The purpose
-    of helper objects is discussed in
-    <a href="special.html#helpersupport">Special Considerations - Helper Support</a>.
-  </dd>
  <dt><h4><code>
    la.reset_object_address(v, u)
  </code></h4></dt>
@@ -405,7 +379,7 @@ above.
 </code></h4></dt>
 <dd>
 Destructor for an archive.  This should be called before the stream is
-closed.  It restores any altered stream facets to their state before the
+closed.  It restores any altered stream facets to thier state before the
 the archive was opened.
 </dd>
 </dl>
@@ -36,7 +36,6 @@ http://www.boost.org/LICENSE_1_0.txt)
    <li>Allen Holub, "Roll Your Own Persistence", <u>Microsoft
    Systems Journal</u> vol 11, no 6 Jun 1996
    <a name="4"></a>
-    <li><a href="www.codefarms.com">Code Farms, Inc.</a>
    <li>Tasos Kontogiorgos &amp; Michael Kim, "A C++
    Template-Based Application Architecture", <u>C++ Report</u>
    <a name="5"></a>
@@ -46,13 +45,13 @@ http://www.boost.org/LICENSE_1_0.txt)
    <a name="7"></a>
    <li>Alexandrescu, Andrei, <u>Modern C++ Design</u>, Addison-Wesley, 2001
    <a name="8"></a>
-    <li>Jim Hyslop, and Herb Sutter, "Factory Redux, Part2",
+    <li>Jm Hyslop, and Herb Sutter, "Factory Redux, Part2",
    <u>C/C++ User's Journal</u>, vol 21, No. 8, August 2003
    <a name="9"></a>
    <li>David Vandevoorde and Nicolai M. Josuttis,
    <u>C++ Templates - The Complete Guide</u>, Addison-Wesley, 2003
    <a name="10"></a>
-    <li>Herb Sutter, "Pimpls--Beauty Marks You Can Depend On",
+    <li>Herb Sutter, "Pimples--Beauty Marks You Can Depend On",
    <u>C++ Report</u>, from <u>More C++ Gems</u>, Cambridge University Press, 2000
    <a name="11"></a>
    <li>James Coplien, "Curiously Recurring Template Patterns",
@@ -63,7 +62,7 @@ http://www.boost.org/LICENSE_1_0.txt)
    <a name="13"></a>
    <li>Stephan Beal, "s11n serialization library", <a href="http://www.s11n.net">www.s11n.net</a>
    <a name="14"></a>
-    <li>Vandevoorde and Josuttis, <b>C++ Templates - A Complete Guide</b>, Addison-Wesley, 2003</a>
+    <li>Vandervoorde and Josuttis, <b>C++ Templates - A Complete Guide</b>, Addison-Wesley, 2003</a>
 </ol>
 <hr>
 <p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2004. 
@@ -42,7 +42,7 @@ template&lt;
 <h2>Rationale</h2>


-    UTF-8 is a method of encoding Unicode text in environments
+    UTF-8 is a method of encoding Unicode text in environments where 
    where data is stored as 8-bit characters and some ascii characters 
    are considered special (i.e. Unix filesystem filenames) and tend
    to appear more commonly than other characters.  While
@@ -88,7 +88,7 @@ template&lt;
 <h2>Requirements</h2>

    <tt>utf8_codecvt_facet</tt> defaults to using <tt>char</tt> as
-    its external data type and <tt>wchar_t</tt> as its internal
+    it's external data type and <tt>wchar_t</tt> as it's internal
    datatype, but on some architectures <tt>wchar_t</tt> is
    not large enough to hold UCS-4 characters.  In order to use
    another internal type.You must also specialize <tt>std::codecvt</tt>
@@ -169,6 +169,9 @@ function initialize() {
          <dt><img style="display:none" src="dot.gif"><a target="detail" href="traits.html#pointer_tracking">pointer_tracking</a>
          <dt><img style="display:none" src="dot.gif"><a target="detail" href="traits.html#const_loading">const_loading</a>
        </dl></div></dd>
+
+
+
      </dl></div></dd>
      <dt><img style="display:none" src="plus.gif" id="wrappers"><a target="detail" href="wrappers.html">Serialization Wrappers</a>
      <dd><div id="wrappers_detail"><dl class="page-index">
@@ -185,7 +188,6 @@ function initialize() {
    <dd><div id="special_detail"><dl class="page-index">
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#objecttracking">Object Tracking</a>
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#classinfo">Class Information</a>
-      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#helpersupport">Helper Support</a>
      <dt><img style="display:none" src="plus.gif" id="portability"><a target="detail" href="special.html#portability">Archive Portability</a>
      <dd><div id="portability_detail"><dl class="page-index">
        <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#numerics">Numerics</a>
@@ -253,7 +255,7 @@ function initialize() {
      <dd><div id="userincludes_detail"><dl class="page-index">
        <dt><img style="display:none" src="dot.gif"><a target="detail" href="headers.html#archiveimplementations">Archive Implementations</a>
        <dt><img style="display:none" src="dot.gif"><a target="detail" href="headers.html#serializationdeclarations">Serialization Declarations</a>
-        <dt><img style="display:none" src="dot.gif"><a target="detail" href="headers.html#serializationimplementations">Serialization Implementations</a>
+        <dt><img style="display:none" 'rc="dot.gif"><a target="detail" href="headers.html#serializationimplementations">Serialization Implementations</a>
      </dl></div>
      <dt><img style="display:none" src="plus.gif" id="libraryimplementation"><a target="detail" href="headers.html#libraryimplementation">Files Which Implement the Library</a>
      <dd><div id="libraryimplementation_detail"><dl class="page-index">
@@ -269,7 +271,6 @@ function initialize() {
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="shared_ptr.html">Template serialization - <code>shared_ptr&lt;class T&gt;</code></a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="shared_ptr2.html"><code>shared_ptr&lt;class T&gt;</code>Revisited</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="pimpl.html">PIMPL</a>
-    <dt><img style="display:none" src="dot.gif"><a target="detail" href="private_base.html">Private Base Classes</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="simple_log.html">A Simple Logging Archive Class</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="derivation.html">Derivation from an Existing Archive Class</a>
  </dl></div></dd>
@@ -35,26 +35,26 @@ We would prefer the solution that is:
 <ul>
  <li>Decomposable. so we can code, test, verify and use each (simple) stage of the conversion 
  independently.
-  <li>Composable. so we can use this composite as a new component somewhere else.
+  <li>Composable. so we can used this composite as a new component somewhere else.
  <li>Efficient, so we're not required to re-implement it again.
  <li>Scalable, so that it works well for short and arbitrarily long sequences.
 </ul>
 The approach that comes closest to meeting these requirements is that described
 and implemented with <a href="../../iterator/doc/index.html">Iterator Adaptors</a>.
-The fundamental feature of an Iterator Adaptor template that makes it interesting to
+The fundamental feature of an Iterator Adaptor template that makes in interesting to
 us is that it takes as a parameter a base iterator from which it derives its
 input. This suggests that something like the following might be possible.
 <pre><code>
 typedef 
-    insert_linebreaks&lt;         // insert line breaks every 76 characters
-        base64_from_binary&lt;    // convert binary values to base64 characters
+    insert_linebreaks&lt;         // insert line breaks every 72 characters
+        base64_from_binary&lt;    // convert binary values ot base64 characters
            transform_width&lt;   // retrieve 6 bit integers from a sequence of 8 bit bytes
                const char *,
                6,
                8
            &gt;
        &gt; 
-        ,76
+        ,72
    &gt; 
    base64_text; // compose all the above operations in to a new iterator

@@ -71,12 +71,12 @@ included is <a target="transform_iterator" href="../../iterator/doc/transform_it
 transform_iterator</a>, which can be used to implement 6 bit integer =&gt; base64 code.

 <h3>Dataflow Iterators</h3>
-Unfortunately, not all iterators which inherit from Iterator Adaptors are guaranteed
+Unfortunately, not all iterators which inherit from Iterator Adaptors are guarenteed
 to meet the composability goals stated above.  To accomplish this purpose, they have
 to be written with some additional considerations in mind.

 We define a Dataflow Iterator as an class inherited from <code style="white-space: normal">iterator_adaptor</code> which
-fulfills a small set of additional requirements.
+fulfills as a small set of additional requirements.

 <h4>Templated Constructors</h4>
 <p>
@@ -110,12 +110,12 @@ std::copy(
 The recursive application of this template is what automatically generates the
 constructor <code style="white-space: normal">base64_text(const char *)</code>  in our example above.  The original
 Iterator Adaptors include a <code style="white-space: normal">make_xxx_iterator</code> to fulfill this function.
-However, I believe these are unwieldy to use compared to the above solution using
+However, I believe these are unwieldy to use compared to the above solution usiing
 Templated constructors.
 <p>
 Unfortunately, some systems which fail to properly support partial function template
 ordering cannot support the concept of a templated constructor as implemented above.  
-A special "wrapper"  macro has been created to work around this problem. With this "wrapper" 
+A special"wrapper"  macro has been created to work around this problem. With this "wrapper" 
 the above example is modified to:
 <pre><code>
 std::copy(
@@ -195,7 +195,7 @@ The standard stream iterators don't quite work for us.  On systems which impleme
 as unsigned short integers (E.G. VC 6) they didn't function as I expected. I also made some
 adjustments to be consistent with our concept of Dataflow Iterators.  Like the rest of our
 iterators, they are found in the namespace <code style="white-space: normal">boost::archive::interators</code> to avoid
-conflicts with the standard library versions.
+conflict the standard library version.
 <dl class = "index">
  <dt><a target="istream_iterator" href="../../../boost/archive/iterators/istream_iterator.hpp">
  istream_iterator</a></dt>
@@ -47,7 +47,7 @@ The serialization library is
 implemented using the <b>C</b>uriously <b>R</b>ecurring <b>T</b>emplate 
 <b>P</b>attern (<b>CRTP</b>).  Also, all common code is factored out into
 separate modules to minimize code repetition. This makes derivation from
-an existing archive less straightforward than it would otherwise be.
+an existing archive less straight forward than it would otherwise be.
 <p> 
 This example illustrates several issues that have to be addressed when doing
 something like this
@@ -84,12 +84,13 @@ the base classes.
    <li><i></i>Reread <a target="detail" href="headers.html#archiveinternals">Archive Internals</a>.
 This describes the class hierarchy so that you know what to override.
    <li><i>Note the usage of PFTO.</i>  Some compilers fail to provide support for
-partial function template ordering.  The serialization library works around this by
+partial function template ordering.  The serialization library works around by
 using <a target="detail" href="implementation.html#functiontemplateordering">
 <b>P</b>artial <b>F</b>unction <b>T</b>emplate <b>O</b>rdering</a> in several places.
-This is done
+In archive classes, this takes
+. This is done
 in several places, including the archive classes themselves.
-    <li><i>Base class functions will usually need to be explicitly invoked.</i>
+    <li><i>Base class functions will usually need to be explicitly invoked</i>
 We commonly specialize the function name <code style="white-space: normal">save_override</code> 
 for saving primitives. Usage of a function name in a derived class
 "hides" similarly named functions of the base class.  That is, 
@@ -120,7 +121,7 @@ so it's what I use.
 </code></pre>
 for just this purpose.  Failure to include required template definitions
 will result in undefined symbol errors when the program is linked.
-    <li><i>Without alteration, this class cannot be further derived from.</i><br>
+    <li><i>Without alteration, this class cannot be further derived from</i><br>
 Base classes using <b>CRTP</b> must be templates with a parameter corresponding to
 the most derived class.  As presented here, this class doesn't qualify, so
 it cannot be used as a base class.  In order to derive further from this class,
@@ -135,7 +136,7 @@ class log_archive_impl :
    ...
 );

-// do not derive from this class !!!
+// do not derived from this class !!!
 class log_archive : 
    public log_archive_impl&lt;log_archive&gt;
 {
@@ -70,7 +70,7 @@ an invalid pointer, or creating a memory leak.
        If an exception occurs, <i>referenced</i> pointers will not need to be deleted
        so there will be no memory leaks. The destructor of this class won't attempt to
        delete these pointers so there will be no problem with dangling references.
-        <i>Owned</i> pointers are handled exactly as described above.
+        <i>owned</i> pointers are handled exactly as described above.
        <p>
        <li><h4>class contains <i>referenced</i> pointers which might be created by load</h4>
        If a <i>referenced</i> pointer is loaded before its corresponding <i>owned</i>
@@ -81,7 +81,7 @@ an invalid pointer, or creating a memory leak.
        <li>Trap exceptions with a <code style="white-space: normal">try/catch</code> block.
        <li>Within the catch part, invoke the archive function 
        <code style="white-space: normal">delete_created_pointers()</code> to delete any pointers
-        created by the class load.  Without other action, objects created in
+        created by the class load.  Without out other action, objects created in
        this way would end up as memory leaks as they are not considered <i>owned</i>
        pointers and hence aren't destroyed.
        <li>The object's destructor won't try
@@ -57,7 +57,7 @@ class archive_exception  : public std::exception
 {
 public:
    typedef enum {
-        unregistered_class,     // attempt to serialize a pointer of
+        unregistered_class,     // attempt to serialize a pointer of an
                                // an unregistered class
        invalid_signature,      // first line of archive does not contain
                                // expected string
@@ -66,8 +66,8 @@ public:
        pointer_conflict        // an attempt has been made to directly serialize
                                // an object after having already serialized the same
                                // object through a pointer.  Were this permitted, 
-                                // the archive load would result in the creation
-                                // of an extraneous object.
+                                // it the archive load would result in the creation
+                                // of extraneous object.
        incompatible_native_format, // attempt to read native binary format
                                // on incompatible platform
        array_size_too_short,   // array being loaded doesn't fit in array allocated
@@ -109,7 +109,7 @@ public:
 <h3><a name="unregistered_class"><code style="white-space: normal">unregistered_class</code></a></h3>
 An attempt has been made to serialize a polymorphic class through a pointer
 without either registering it or associating it with an export key.  This can also occur
-when using a new archive whose class name has not been added to the system with the 
+when using a new archive how class name has not been added to the system with the 
 <code style="white-space: normal">BOOST_ARCHIVE_CUSTOM_ARCHIVE_TYPES</code> macro.

 <h3><a name="invalid_signature"><code style="white-space: normal">invalid_signature</code></a></h3>
@@ -121,7 +121,7 @@ exception is thrown.
 This system records the current library version number to all archives created.  Note that this is in
 no way related to version number of classes used by application programs. This refers
 to the version of the serialization system used to create the archive. Future versions
-of this serialization system will be able to identify archives created under a previous
+of this serialization system will be able to identify archives created under previous
 (i.e. this) system and alter the loading procedure accordingly.  Hence, future enhancements
 to this serialization system should not obsolete any existing archive files.  It is only
 necessary to increment this version number when the newer system creates archives
@@ -225,7 +225,7 @@ This, in turn, can result in the throwing of this exception.

 <h3><a name="invalid_class_name"><code style="white-space: normal">invalid_class_name</code></a></h3>
 Class name length greater than the maximum permitted. Most likely cause is a corrupted 
-archive  or an attempt to insert a virus via the buffer overrun method.
+archive  or an attempt to insert virus via buffer overrun method.

 <h3><a name="unregistered_cast"><code style="white-space: normal">unregistered_cast</code></a></h3>
 In order to support casting between pointers of base and derived classes
@@ -239,7 +239,7 @@ whose relationship has not been registered,

 <h3><a name="multiple_code_instantiation"><code style="white-space: normal">multiple_code_instantiation</code></a></h3>
 This exception is thrown when it is detected that the serialization of the same type 
-has been instantiated more than once.  This might occur when
+has been instantiated more that once.  This might occur when
 serialization code is instantiated in both the mainline and one or more DLLS.

 <h3><a name="xml_archive_parsing_error"><code style="white-space: normal">xml_archive_parsing_error</code></a></h3>
@@ -250,8 +250,8 @@ to the loading serialization and this exception might be thrown.  This might
 occur for one of the following reasons:
 <ul>
    <li>The archive has been edited outside the serialization system.  This might
-be possible if only the data is changed and the XML attributes and nesting
-structure are left unaltered.  But any other editing is likely to render the
+be possible if only the data is changed and not the XML attributes and nesting
+structure is left unaltered.  But any other editing is likely to render the
 archive unreadable by the serialization library.
    <li>The serialization has been altered and an archive generated by the old
 code is being read.  That is, versioning has not been properly employed to
@@ -259,7 +259,7 @@ properly deserialize previously created archives.
 </ul>

 <h3><a name="xml_archive_tag_mismatch"><code style="white-space: normal">xml_archive_tag_mismatch</code></a></h3>
-This exception will be thrown if the start or end tag of an XML element doesn't match
+This exception will be thrown if the start or end tag of and XML element doesn't match
 the name specified for the object in the program.

 <h3><a name="xml_archive_tag_name_error"><code style="white-space: normal">xml_archive_tag_name_error</code></a></h3>
@@ -57,14 +57,14 @@ the following functions
    and operating systems. This makes it unusable for support of portable archives.
  <li>
    Even if the type name string could somehow be made portable, there is no 
-    guarantee that class headers would be included in the same namespace accross 
+    guarentee that class headers would be included in the same name space accross 
    different applications. In fact, including different headers in different
-    namespaces is an accepted method used to avoid namespace conflicts.
+    name spaces is an accepted method used to avoid name space conflicts.
    Thus the namespace::class_name can't be used as a key.
  <li>
    There exists the possibility that different classes use different type id 
-    mechanisms.  The class header might include this information. If we want to 
-    import class headers accross applications, it's convenient that the type id
+    mechanism.  The class header might include this information. If we want to 
+    import class headers accross applications, its convenient that the type id
    mechanism support inter-operability accross different type id systems.
 </ul>
 <h3>Features</h3>
@@ -135,7 +135,7 @@ instance created for each type.  However, this is enforced only at the executabl
 module level.  That is, if a program includes some shared libraries or DLLS,
 there may be more than one instance of this class correponding to a particular type.
 For this reason the comparison functions below can't just compare the addresses of 
-this instance but rather must be programmed to compare the actual information 
+this instance but rather must be programmed to compare the the actual information 
 the instances contain.
 <dl>

@@ -193,7 +193,7 @@ bool operator==(const extended_type_info & rhs) const;
 bool operator!=(const extended_type_info & rhs) const;
 </code></pre></h4></dt>
 <dd>
-These functions are used to compare
+These functions are used to compare 'wo 
 <a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">
 <code style="white-space: normal">
 extended_type_info
@@ -213,7 +213,7 @@ Construct a new instance of the type to which this
 extended_type_info
 </code>
 </a>
-record corresponds. This function takes a variable list of up to 4 arguments
+record corresponds. This function takes variable list of up to 4 arguments
 of any type.  These arguments are passed to the type's constructor
 at runtime.  In order to use the facility, 
 one must declare a type sequence for the constructor arguments.  
@@ -222,9 +222,9 @@ with those specified when the type was exported.
 This function permits one to create instances of
 any exported type given only the exported <strong>GUID</strong> assigned
 with BOOST_CLASS_EXPORT.  
-If these types are defined in DLLS or shared libraries loaded at runtime, 
-these constructors can be called until the module is unloaded.  
-Such modules are referred to as <b>plugins</b>. 
+If these types are defined in DLLS or shared libraries.  When these modules
+are loaded at runtime, these constructor can be called until the module
+is unloaded.  These modules are referred to as <b>plugin</b>. 
 </code>
 </dd>

@@ -245,7 +245,7 @@ object.

 </dl>

-<h3><a name="requirements">Requirements for an Implementation</a></h3>
+<h3><a name="requirements">Requirements for and Implementation</a></h3>
 In order to be used by the serialization library, an implementation of
 <code style="white-space: normal">extended_type_info</code>, 
 (referred to as ETI here), must be derived from 
@@ -309,7 +309,7 @@ with the include argument list.
 </dd>

 <dt><h4><code style="white-space: normal"><pre>
-virtual void * destroy(void const * const ptr ) const;
+virtual void * destroy(void const * const ptr ) ) const;
 </pre></code></h4></dt>
 <dd>
 Destroy an instance of this type. This calls the
@@ -348,7 +348,7 @@ The test program <code style="white-space: normal"><a target="test_no_rtti" href
 implements this function in terms of the <code style="white-space: normal"><a target="extended_type_info_no_rtti.hpp" href="../../../boost/serialization/extended_type_info_no_rtti.hpp">
 extended_type_info</a></code> API above to return the export key associated with the class.  
 This requires that non-abstract types be exported. It also demonstrates the
-inter-operability between two different implementations of
+inter-operability with between two different implementations of
 <code style="white-space: normal">extended_type_info</code>.

 <h3><a name="type_requirements">Requirements for Each Type</a></h3>
@@ -29,10 +29,10 @@ http://www.boost.org/LICENSE_1_0.txt)
        </tr>
    </table>
    <hr>
-This section will be used to list answers to questions raised in the mailing
+This section will be used to list answers to questions raise in the mailing
 lists.  Most of these are due to subtle aspects of the library which are
-overlooked even though they might be described in the documentation.  Often,
-these issues are very easy to address - but can be excruciatingly difficult to
+overlooked even though they might be described in the documenation.  Often,
+these issues are very easy to address - but can be excruciating difficult to
 find.  Should you have such an experience, feel free to vent your frustration
 in a constructive way by adding in your own item.  The best way to do this
 is to create a <a href="http://svn.boost.org/trac/boost/browser">"TRAK" item</a> 
@@ -42,10 +42,10 @@ http://www.boost.org/LICENSE_1_0.txt)
  </dl>
 </dl>

-This library includes a large number of files. They are organized and classified
-according to the purposes listed in the above index. 
+This library includes a large number of files. The are organized and classified
+according to purpose listed in the above index. 
 <p>
-<code style="white-space: normal">namespace</code> of classes and templates is synchronized
+<code style="white-space: normal">namespace</code> of a classes and templates is syncronized
 with the directory in which the file is found.  For example, the class declaration
 <pre><code>
 boost::archive::text_oarchive
@@ -95,7 +95,7 @@ boost/archive/text_oarchive.hpp
 <dt><a target="text_wiarchive" href="../../../boost/archive/text_wiarchive.hpp">
 boost/archive/text_wiarchive.hpp
 </a>
-<dd>wide character text input archive used for loading.</dd>
+<dd>wide character text input archive used forloading.</dd>

 <dt><a target="text_woarchive" href="../../../boost/archive/text_woarchive.hpp">
 boost/archive/text_woarchive.hpp
@@ -207,7 +207,7 @@ This group of headers includes templates which implement serialization for Stand
 Library or Boost Library templates.  Any program which uses these templates can
 invoke serialization of objects of these types just by including the corresponding header.
 <p>
-By convention these header files are named:
+By convention' these header files are named:

 boost/serialization/xxx.hpp

@@ -257,7 +257,7 @@ for in all archive implementations.  The serialization system relies on
 certain special types such as <code style="white-space: normal">class_id_type</code> and others to 
 record information in archives that is required to reconstruct the original
 data structure.  These are handled exactly as any other serializable type.
-That is, they can be handled as simple primitives such as they are in simple
+That is, the can be handled as simple primitives such as they are in simple
 text files, or with special code as they are in xml archives.
 </dd>

@@ -269,7 +269,7 @@ boost/archive/basic_text_iprimitive.hpp
 </a>
 </dt>
 <dd>
-Implementation of serialization of primitive types in terms of character
+Implementation of serialization of primitive types in terms of an character
 or wide character text streams. This is used in the implementation of text and
 xml archives.  Presumably this would be useful for implementations of other variations
 of text archives such as user friendly text or windows ini files.
@@ -283,7 +283,7 @@ boost/archive/basic_binary_iprimitive.hpp
 </a>
 </dt>
 <dd>
-Implementation of serialization of primitive types in terms of character
+Implementation of serialization of primitive types in terms of an character
 or wide character binary streams. 
 </dd>

@@ -294,10 +294,10 @@ boost/archive/basic_binary_oarchive.hpp
 boost/archive/basic_binary_iarchive.hpp
 </a>
 <dd>
-Implementation of serialization of all types in terms of character
+Implementation of serialization of all types in terms of an character
 or wide character binary streams.  This is factored out separately from the
 implementation of binary primitives above.  This may facilitate the creation of
-other types of binary archives in the future. It also preserves analogy and symmetry with
+other types of binary archives in the future. It also preserves analogy and symetry with
 the rest of the library which aids in understanding.
 </dd>
 <dt><a target="basic_text_oarchive" href="../../../boost/archive/basic_text_oarchive.hpp">
@@ -315,10 +315,10 @@ boost/archive/basic_xml_iarchive.hpp
 </a>
 </dt>
 <dd>
-Implementation of serialization of all types in terms of character
+Implementation of serialization of all types in terms of an character
 or wide character text streams. These classes specify archive type specific
 behavior on a type by type basis.  For example, <code style="white-space: normal">basic_xml_oarchive.hpp</code>
-includes code to guarantee that any object not attached to a name will 
+includes code to guarentee that any object not attached to a name will 
 trap during compile time. On the other hand, <code style="white-space: normal">basic_text_oarchive.hpp</code>
 contains code to strip out and ingore any names attached to objects.
 <p>
@@ -345,7 +345,8 @@ These files are found in the directory
 <a target="boost_archive_detail" href="../../../boost/archive/detail">boost/archive/detail</a>.  
 These are included as necessary by the archive class implemenations listed above.
 This has the unfortunate side effect of making the implementation less transparent.
-Users should never find it necessary to change these files.
+of the library in order to implement either a class serialization or a new
+archive type. Users should never find it necessary to change these files.
 <p>
 The following discussion is based on the
 <a target="class_diagram" href="class_diagram.html">class diagram</a>.
@@ -355,7 +356,7 @@ boost/archive/detail/interface_iarchive.hpp</a>
 <dt><a target="interface_iarchive" href="../../../boost/archive/detail/interface_iarchive.hpp">
 boost/archive/detail/interface_iarchive.hpp</a>
 <dd>
-Here are the declarations and definitions for the 
+Here are the declarations and definitions which for the 
 <a href="archives.html">archive_concept</a>. This class redirects calls to the 
 archive interface to a function named <code>save_override</code> in the most derived
 archive class. 
@@ -402,7 +403,7 @@ library code for that part of the code which only depends upon the archive type.
 Building of the library generates and compiles code for all archives implemented.

 <ul>
-  <li>Serialization of user and primitive types runs at top speed. This is a noticeable
+  <li>Serialization of user and primitive types runs a top speed. This is a noticiable
  difference with a previous version of the library which did not use templates for archives.
  <li>Library implementation code that never changes need only be compiled once
  rather than each time a user's program is recompiled.  This can save much
@@ -417,22 +418,22 @@ Building of the library generates and compiles code for all archives implemented
 </ul>	
 An example of this is the usage of the spirit library in the library.
 It takes a long time to compile and includes lots of other files. Having this
-only in the library is much more convenient that having to include it in every
+only in the library is much more convenient that having to include in every
 program which uses xml serialization.

 <a name="dataflowiterators">
 <h4>Dataflow Iterators</h4>
 In the course of developing this library, it became convenient to make a set
 of composable iterator adaptors for handling archive text.  Applications include
-escaping and unescaping xml text and implementing to/from base64 conversion among
+escaping and unescaping xml text, implementi'g to/from base64 conversion among
 others.
 <p>
-This is a ripe topic in itself. It's touched upon by the 
+This is a ripe topic in itself. Its touched upon by the 
 <a href="../../../libs/iterator/doc/index.html">boost iterator</a> libraries, 
 <a href="http://www.zib.de/weiser/vtl/index.html">View Template Library</a>, and others. 
 <p>
 The code for these iterators is really independent of this library.  But since it
-hasn't been and probably won't be reviewed outside of this context. I've left it in a directory 
+hasn't been and probably won't be reviewed outside of this context. I've left in a directory 
 local to the serialization library:
 <a target="archiveiterators" href="../../../boost/archive/iterators">boost/archive/iterators</a>.
 These iterators are described in 
@@ -30,24 +30,24 @@ http://www.boost.org/LICENSE_1_0.txt)
  <li>27 Feb 2002
    <ul>
      <li>divide interface from implementation for class 
-          serialization to permit compilation on gcc
-      <li>improved template instantantation for type templates
+          serialization to permit compiliation on gcc
+      <li>improved template instantanciation for type templates
    </ul>
  <li>18 Mar 2002 - draft #2 uploaded to boost
    <ul>
      <li>elminated locale effects on archives
      <li>added signature and library version to archive header
-      <li>improved detection of errors when objects are serialized 
-          as pointers and subsequently serialized as objects
+      <li>improved detection of errors when objects are serializationed 
+          as pointers and subsequently serializationed as objects
      <li>permit non-portable binary archives
-      <li>implement workaround for systems such as MSVC 6.0 that
-          don't support partial ordering
+      <li>implement work around for systems such as MSVC 6.0 that
+          don'tsupport partial ordering
    </ul>
  <li>16 May 2002 - draft #3 uploaded to boost
    <ul>
      <li>Ability to specify serialization of other templates in a
          non-intrusive way.
-      <li>Included an example which uses boost::shared_ptr.
+      <li>Included and example which uses boost::shared_ptr.
      <li>improved documentation
      <li>More test cases
      <li>More testing and documentation of obscure situtations
@@ -65,7 +65,7 @@ http://www.boost.org/LICENSE_1_0.txt)
      <li>minor corrections
      <li>Additions to documentation to explicitly address issues of
          exception safety.
-      <li>More test cases/demos to illustrate handling of the above issues.
+      <li>More test cases/demos to illustrate handlling of the above issues.
      <li>Additions to documentation to include rationale for not depending
          on type_id
      <li>Implementation of serialization of boost::shared_ptr.
@@ -127,8 +127,8 @@ http://www.boost.org/LICENSE_1_0.txt)
    </ul>
  <li>1 November 2004 - final changes for first boost official release 1.32 .
    <ul>
-       <li>Adjustments to address package compatible with two-phase lookup.
-       <li>Many small adjustments to accommodate quirks of various compilers.
+       <li>Adjustments to address make package compatible with two-phase lookup.
+       <li>Many small adjustments to accomdate quirks of various compilers.
       <li>A few bug fixes.
    </ul>
 </ol>
@@ -26,13 +26,20 @@ http://www.boost.org/LICENSE_1_0.txt)
 </table>
 <hr>
 <dl class="page-index">
+  <dt><a href="#functiontemplateordering">Partial Function Template Ordering</a>
  <dt><a href="#charencoding">Character Encoding</a>
+  <dt><a href="#tempatesyntax">Template Invocation syntax</a>
+  <dt><a href="#partialtemplatespecialization">Partial Template Specialization</a>
  <dt><a href="#othercompilerissues">Specific Compiler/Library Issues</a>
  <dl class="page-index">
-    <dt><a href="#gcc4x">44.X</a>
+    <dt><a href="#gcc3x">GCC 3.X, 4.X</a>
+    <dt><a href="#gcc295">GCC 2.95</a>
    <dt><a href="#intel80">Intel 8.0</a>
    <dt><a href="#vc80">Visual C++ 8.0</a>
    <dt><a href="#vc71">Visual C++ 7.1</a>
+    <dt><a href="#vc70">Visual C++ 7.0</a>
+    <dt><a href="#vc6">Visual C++ 6.0</a>
+    <dt><a href="#borland">Borland 5.64 and 5.51</a>
    <dt><a href="#comeau">Comeau 4.3.3</a>
    <dt><a href="#codewarrior9">Code Warrior 9.x</a>
    <dt><a href="#codewarrior">Code Warrior 8.3</a>
@@ -42,11 +49,86 @@ http://www.boost.org/LICENSE_1_0.txt)
  </dl>
 </dl>

+<h3><a name="functiontemplateordering">Partial Function Template Ordering</a></h3>
+Not all C++ compilers correctly support partial function template ordering (PFTO).
+For these compilers, the following code will fail to compile:
+<pre><code>
+template&lt;class Archive, class T&gt;
+void serialize(
+    Archive & ar, 
+    T & t, 
+    const unsigned int file_version
+){
+    ...
+}
+
+template&lt;class Archive, class T&gt;
+void serialize(
+    Archive & ar, 
+    my_template&lt;T&gt & t, 
+    const unsigned int file_version
+){
+    ...
+}
+</pre></code>
+The serialization library works around this issue by using a different
+default definition of the first template:
+<pre><code>
+template&lt;class Archive, class T&gt;
+void serialize(
+    Archive & ar, 
+    T & t, 
+    const unsigned long int file_version  // Note: change to long
+){
+    ...
+}
+</pre></code>
+Now, the second template is not matched with the first one so there
+is no PFTO and no compile error.  When the serialization library invokes
+<pre><code>
+serialize(ar, t, 0);
+</pre></code>
+the function declaration is first matched against templates with
+an integer for the third argument.  If there is a match, the matching
+template is instantiated and later invoked.  If there is no match,
+an attempt is made to match other templates by converting arguments to other types.
+In this case the third argument can be converted to long to match
+the first template - which is the default.  So in this case, the first
+template will be instantiated and later invoked.  We have managed to
+use function overloading to achieve the same effect as PFTO
+were it correctly implemented.
+<p>
+This depends upon undefined behavior of a compiler already
+determined to be non-conforming.  In other words, there is no 
+guarantee that this will work on all compilers.  If a compiler does not
+correctly support PFTO and this method cannot be used to workaround
+it, non-intrusive serialization cannot be supported for that compiler.
+As of this writing, such a compiler has not been encountered.
+<p>
+It turns out that using this "trick" can create problems with
+compilers that DO correctly support PFTO.  For this reason we
+define a macro <code style="white-space: normal">BOOST_PTFO</code> which 
+is defined to be <code style="white-space: normal">long</code>
+for non-conforming compilers and nothing for conforming ones. So
+the default definition is really:
+The serialization library works around this issue by using a different
+default definition of the first template:
+<pre><code>
+template&lt;class Archive, class T&gt;
+void serialize(
+    Archive & ar, 
+    T & t, 
+    const unsigned BOOST_PFTO int file_version  // Note: change to BOOST_PFTO
+){
+    ...
+}
+</pre></code>
+
 <h3><a name="charencoding">Character Encoding</a></h3>
 The whole question of character encoding combined with wide characters
 is much more complicated than it would seem to be. The current library
 defines in 3 formats (text, binary, and XML), wide and narrow characters, 
-and attempts to be portable between compiler libraries.  The results of 
+an attempts to be portable between compiler libraries.  The results of 
 a rather long consideration of all these factors has been to set
 default encoding according to the following rules.
 <ul>
@@ -67,7 +149,7 @@ default encoding according to the following rules.
 </ul>
 This character encoding is implemented by changing the <code style="white-space: normal">locale</code> of the
 i/o stream used by an archive when the archive is constructed, the stream
-locale is changed back to its original value. This action can be overridden 
+local is changed back to its original value. This action can be overridden 
 by specifying <code style="white-space: normal">boost::archive::no_codecvt</code>
 when the archive is opened.  In this case, the stream <code style="white-space: normal">locale</code> will
 not be changed by the serialization library.
@@ -93,8 +175,32 @@ do the following.
  <li>Create the archive with the flag <code style="white-space: normal">no_codecvt</code>.
 </ul>
 Naturally, the input process has to be symmetrical.
+<h3><a name="partialtemplatespecialization">Partial Template Specialization</a></h3>
+Compilers which fail to support partial template specialization will fail to compile
+the following code.  To make this compiler, the <code style="white-space: normal">const</code> has to be removed.
+<pre><code>
+void f(A const* a, text_oarchive& oa)
+{
+  oa << a;
+}
+</code></pre>
+<h3><a name="tempatesyntax">Template Invocation syntax</a></h3>
+Some compilers may not recognize the syntax:
+<pre><code>
+ar.template register_type&lt;T&gt;();
+</code></pre>
+for "registering" derived pointers of polymorphic classes.  The actual 
+function prototype is:
+<pre><code>
+template&lt;T&gt;
+void register_type(T * t = NULL);
+</code></pre>
+so that one may write <code style="white-space: normal">ar.register_type(static_cast&lt;T *&gt;(NULL))</code> instead of
+the syntax described above.
+</ul>
 <h3><a name="othercompilerissues">Specific Compiler/Library Issues</a></h3>
-<h4><a name="gcc4x">GCC 4.X</a></h4>
+
+<h4><a name="gcc3x">GCC 3.X, 4.X</a></h4>
 <ul>
    <li>GCC versions for Cygwin and MinGW fail to support wide character I/O.  
    So all tests using wide char I/O fail.  Note that if wide character I/O support
@@ -114,6 +220,17 @@ Naturally, the input process has to be symmetrical.
    -Wno-ctor-dtor-privacy
    </code></pre>
 </ul>
+<h4><a name="gcc295">GCC 2.95</a></h4>
+All of the above plus:<br>
+<ul>
+    <li>The serialization library depends on the templated stream 
+    implementation to function properly.
+    to function properly.  So STLPort must be used to build the library.
+    <li>Polymorphic archive tests fail.
+    <li>XML serialization only works with version 1.6x of spirit. In order to build 
+    and use this library with this compiler, one must use version 1.6x rather than the 
+    latest version shipped with boost. See <a href="release.html">Release Notes</a>. 
+</ul>
 <h4><a name="intel80">Intel C++ 8.0</a></h4>
 No known issues. All tests compile and run in debug and release modes.

@@ -133,12 +250,12 @@ This is due to the way that VC++ handles templated code with __decl(dllexport) a
 __decl(dllimport) specifications.  Basically, this compiler requires that all the
 instantiations have the same specification - even though they have different
 template arguments. The example <code style="white-space: normal">
-demo_portable_iarchive.cpp</code> would have to be reformulated as a library or dll
+demo_portable_iarchive.cpp</code> would have to reformulated as a library or dll
 similar to the pre-defined archives in order to function.
 <p>
 This compiler does not have RTTI or exception handling turned on by default.  Although
 they are not strictly necessary to use the serialization package, the example and test
-programs presume that they are enabled.  So be sure your command line or IDE settings 
+program presume that they are enabled.  So be sure your command line or IDE settings 
 enable these features if you want to build and run these programs.
 <p>
 This compiler can treat <code style="white-space: normal">wchar_t</code> as either
@@ -154,14 +271,14 @@ includes this switch by default.  So if want to use the libraries that
 when you compile your own applications.
 <h5>Using the Visual C++ IDE</h5>
 The library includes a VC++ 7.1 "Solution" - <code style="white-space: normal">BoostSerializationLibrary</code>
-along with a set of project files - one for each demo and test. Consider the following if you
-decide to use these configurations.
+along with of a set of project files - one for each demo and test. Consider the following if you
+decided to use these configurations.
 <ul>
    <li>The projects assume that the tests have been built with bjam using the default
    locations.  This will result in a <code style="white-space: normal">bin</code> subdirectory
    within one's main boost directory.  Below this there is a whole structure which maintains 
    object and library files according to the type of build.  The easiest way to build this is to
-    invoke the runtest script which uses bjam (see below).  If the libraries are not in these locations,
+    invoke the runtest script which uses bjam. (see below)  If the libraries are not in these locations,
    the projects will have to be modified accordingly.
    <li>There are project configurations for all the combinations of build variants that boost
    supports. That is for release, debug, static, static multi-threading, etc..
@@ -195,6 +312,77 @@ decide to use these configurations.
    in sync with those included here.
 </ul>

+<h4><a name="vc70">Visual C++ 7.0</a></h4>
+<ul>
+    <li>The "pimpl" demo fails to link.  Cause and workaround for this is unknown
+    <li>XML serialization only works with version 1.6x of spirit.  In order to build and use this
+    library with this compiler, one must use version 1.6x rather than the latest version
+    shipped with boost.  See <a href="release.html">Release Notes</a>.
+    <li>This compiler does not support partial template specialization.  
+    The implementation of the new <code>shared_ptr</code> serialization depends upon
+    compiler support for partial template specialization.  This compiler doesn't implement this
+    feature. In order to serialize <code style="white-space: normal">shared_ptr&lt;A&gt;</code>,
+    invoke the macro <code style="white-space: normal">BOOST_SERIALIZATION_SHARED_PTR(A)</code>
+    in the header code.
+    <li>Lack of support for partial template specialization also creates problems for
+    serialization of <code style="white-space: normal">std::map</code>.  In order to serialize
+    instances of this type include the invocation of BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION
+    for the key type of the map.
+</ul>
+<h4><a name="vc6">Visual C++ 6.5</a></h4>
+all the above issues for Visual C++ 7.0 plus:
+<ul>
+    <li>Out of line template definitions are not recognized and fail with a confusing
+    error message.  To function save/load/serialize member function templates must be defined
+    within the class definition.  This feature is essential to <code style="white-space: normal">demo_pimpl</code>. Hence,
+    this program will fail to compile.  In this case the problem can't be worked around and
+    still demonstrate this facility.
+    <li>This compiler does not support <code style="white-space: normal">wchar_t</code> as a separate type.  It defines
+    <code style="white-space: normal">wchar_t</code> as an alias for <code style="white-space: normal">short int</code>.  In general things will still
+    function.  However certain customization, such as overloading archive operators for
+    saving/loading wide character arrays would produce surprises in this environment.
+    <li>Under certain circumstances, a program will fail to link with the message:
+    LIN1179 - "invalid or corrupt file: duplicate comdat".  According
+    to <a href="http://groups.google.com/groups?th=8a05c82c4ffee280">
+    http://groups.google.com/groups?th=8a05c82c4ffee280
+    </a> (look for P78)
+    A LNK1179 error occurs when:
+    <ul>
+        <li>The template class takes at least two arguments.
+        <li>The template is used at least two times with identical first
+        and different second arguments.
+        <li>The static member variable is of an object type with at least one
+        base class. (In another scenario it also occurred using a member
+        without a base class.)
+    </ul>
+    Working around this in the implementation of the library for this compiler
+    entailed a ridiculous amount of effort.  Even so, the effort wasn't entirely successful.
+    With this compiler, this message will still appear under the following conditions:
+    <ul>
+        <li>When serializing a class with multiple base classes.  This problem causes two 
+        failure in the test suite.  I have been unable to devise a way to work around this.
+        <li>Using more than one kind of archive in the same code module. This should be easy 
+        to work around in practice.
+    </ul>
+    <li>Code modules exceeding some undetermined size that use the library will fail with
+    <i>fatal error C1204: compiler limit : internal structure overflow</i>.  This can be addressed
+    by dividing the module into smaller ones.
+</ul>
+<h4><a name="borland">Borland 5.64 and 5.51</a></h4>
+<ul>
+    <li><code style="white-space: normal">enum</code> data members cannot be serialized.
+    Conversion to/from integers will work around the problem.
+    <li>If class serialize functions are not accessible either by making them public or by
+    including <code style="white-space: normal">friend</code> declarations as described in 
+    <a href="serialization.html#member">Class Serialization - Member Function</a>, the
+    will compile but fail at runtime.
+    <li>Tests using custom extended type which doesn't use RTTI fails. (5.64 only !).
+    <li>Tests built in release mode fail. This seems to be an issue with the boost test system
+    with this compiler.
+    <li>XML serialization only works with version 1.6x of spirit. In order to build 
+    and use this library with this compiler, one must use version 1.6x rather than the 
+    latest version shipped with boost. See <a href="release.html">Release Notes</a>. 
+</ul>
 <h4><a name="comeau">Comeau 4.3.3</a></h4>
 <ul>
    <li>This compiler fails to make a DLL with export under windows.
@@ -205,7 +393,7 @@ decide to use these configurations.

 <h4><a name="codewarrior9">Code Warrior 9.x</a></h4>
 <ul>
-    <li>Some tests and demos fail - still under investigation
+    <li>Some tests and demos demos fail - still under investigation
 </ul>

 <h4><a name="codewarrior">Code Warrior 8.3</a></h4>
@@ -225,7 +413,7 @@ Several compilers, including Visual C++ 6.0, use an older dinkumware library.
 These platforms have several issues: 
 <ul>
    <li>The dinkumware library shipped with this compiler does not change the locale facet
-    of an i/o stream unless the <code style="white-space: normal">imbue</code> function is called before the
+    of an i/o stream unless the <code style="white-space: normal">imbue</code> function is called before the the
    stream is opened.  In order to use this library with this environment to generate UTF-8
    files, one cannot depend on the "automatic" setting of locale that archives implement. The
    stream locale must be set explicitly on the stream before an archive is opened on it.  The
@@ -237,7 +425,7 @@ These platforms have several issues:

 <h4><a name="stlport">STLPort 4.5.3</a></h4>
 <ul>
-    <li>when built to use the dynamic linking versions of the C++ runtime code (<runtime-link>dynamic)
+    <li>when built to use dynamic linking versions of C++ runtime code (<runtime-link>dynamic)
    all tests fail to link.  This is due to a missing symbol in the stlport library related
    to custom codecvt facets.
    <li>the test_set fails to run correctly. It seems the hashed set iterator doesn't
@@ -247,7 +435,7 @@ These platforms have several issues:

 <hr>
 <p>Revised 1 November, 2004 
-<p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2015.
+<p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2004. 
 Distributed under the Boost Software License, Version 1.0. (See
 accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 </i></p>
@@ -36,13 +36,13 @@ techiques on how to use the library to address specific situations.

 <h2><a name="functionobject"></a>Serializing a Function Object</h2>
 An example on how to serialize a function object.  I believe this
-could be done by serializing a pointer to the object in question.  Since
-the Serialization library resurrects a pointer of the correct type
+could be done by serializing pointer to the object in question.  Since
+the Serialization library resurrects pointer of the correct type
 this should be easily implementable.
 <p>
 If a group of function objects were all derived from the
 same polymorphic base class - perhaps via multiple inheritance,
-then the function object effectively becomes a "variable" which
+the the function object effectively becomes a "variable" which
 encapsulates code.
 <p>
 This case study would show how to do this.
@@ -51,19 +51,19 @@ This case study would show how to do this.

 Often users want to add their own special functionality to an
 existing archive.  Examples of this are performance enhancements
-for specific types, adjustment of output syntax for xml archives,
+for specific types, Adjustment of output syntax for xml archives,
 and logging/debug output as archives are written and/or read.
-If this functionality is implemented as an "adaptor" template
-which takes the base class as a template argument, such functionality could be
-appended to any archive for which that functionality makes sense.
+If this functionalty is implemented as an "adaptor" template
+which takes the base class as a template argument, such functionality
+appended to any archive for which that funtionality makes sense.
 For example, an adaptor for generating an xml schema could be
-appended to both wide and narrow character versions of xml archives.
+appended to both wide narrow character versions of xml archives.
 <p>
 This case study would show how to make a useful archive adaptor.

 <h2><a name="archivehelper"></a>Archive Helpers</h2>
 Some types are not serializable as they stand.  That is - they
-do not fulfill the requirements of the "Serializable Concept".
+do not fullfill the requirements of the "Serializable Concept".
 The iconic example of this is boost::shared_ptr.  Sometimes
 these types could be made serializable by adding code inside
 the library.  Of course, doing that would create a lifetime
@@ -31,7 +31,7 @@ the "Handle Body Idiom". Included in this library is a program called
 <a href="../example/demo_pimpl.cpp" target="demo_impl_cpp">demo_pimpl.cpp</a> 
 which illustrates how this is used. The file 
 <a href="../example/demo_pimpl_A.cpp" target="demo_impl__Acpp">demo_pimpl_A.hpp</a>
-contains the declaration of the A class that hides its implementation
+contains the declaration of the a class that hides its implementation
 by including a pointer to struct B that is only defined as a pointer.
 <pre><code>
 // class whose declaration is hidden by a pointer
@@ -45,11 +45,8 @@ struct A {
    A();
 };
 </code></pre>
-Serialization of A requires access to the definition of B. But that doesn't mean
-that it requires the this access from the header file.  Since B is a pointer,
-a declaration of class B is sufficient.  The implemenation of the serialization
-of A includes the definition of class B defined in the separately compiled module:
-
+Serialization of A requires access to the definition of B in order so it
+is defined in the separately compiled module:
 <a href="../example/demo_pimpl_A.cpp" target="demo_impl_A_cpp">demo_pimpl_A.cpp</a>
 by:
 <pre><code>
@@ -93,7 +90,7 @@ void A::serialize(boost::archive::text_iarchive & ar, const unsigned int file_ve
 </code></pre>
 The problem is that when compiling the above code, 
 there is no instantiation of the <code style="white-space: normal">serialize</code> template.
-There can't be as it's not "known" what types of archives
+There can't be as its not "known" what types of archives
 the serialization is going to be used with.  So these functions are "missing"
 when an attempt to link is made.  The solution is to explicitly instantiate
 serialization code for those archives which are going to be used.  In this
@@ -1,170 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<!--
-(C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . 
-Use, modification and distribution is subject to the Boost Software
-License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-http://www.boost.org/LICENSE_1_0.txt)
-->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-<link rel="stylesheet" type="text/css" href="style.css">
-<title>Serialization - Private Base Classes</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary="header">
-  <tr> 
-    <td valign="top" width="300"> 
-      <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center">Serialization</h1>
-      <h2 align="center">Private Base Classes</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-In many cases, serialization of private or protected base classes present no special problems.
-This is true for both simple classes and types as well as pointers to those
-classes and types. That is, the following program compiles and runs exactly as one would expect.
-<pre><code>
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// test_private_base.cpp
-
-// (C) Copyright 2009 Eric Moyer - http://www.rrsd.com . 
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include <fstream>
-#include <boost/config.hpp>
-#if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::remove;
-}
-#endif
-
-#include <boost/serialization/access.hpp>
-#include <boost/serialization/base_object.hpp>
-#include <boost/serialization/export.hpp>
-
-class Base {
-    friend class boost::serialization::access;
-    int m_i;
-    template<class Archive>
-    void serialize(Archive & ar, const unsigned int version){
-        ar & BOOST_SERIALIZATION_NVP(m_i);
-    }
-protected:
-    bool equals(const Base &rhs) const {
-        return m_i == rhs.m_i;
-    }
-    Base(int i = 0) :
-        m_i(i)
-    {}
-};
-
-class Derived : private Base {
-    friend class boost::serialization::access;
-private:
-    Base & base_cast(){
-        return static_cast<Base &>(*this);
-    }
-    template<class Archive>
-    void serialize(Archive & ar, const unsigned int version){
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
-    }
-public:
-    bool operator==(const Derived &rhs) const {
-        return Base::equals(static_cast<const Base &>(rhs));
-    }
-    Derived(int i = 0) :
-        Base(i)
-    {}
-};
-
-int
-main( int /* argc */, char* /* argv */[] )
-{
-    const char * testfile = boost::archive::tmpnam(NULL);
-
-    // serialize Derived and Base
-    Derived a(1), a1(2);
-    {   
-        test_ostream os(testfile);
-        test_oarchive oa(os);
-        oa << boost::serialization::make_nvp("a", a);
-    }
-    {
-        test_istream is(testfile, TEST_STREAM_FLAGS);
-        test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
-        ia >> boost::serialization::make_nvp("a", a1);
-    }
-    std::remove(testfile);
-
-    if(a != a1)
-        return 1;
-
-    // serialize Derived and Base
-    Derived *ta = &a;
-    Derived *ta1 = NULL;
-    {   
-        test_ostream os(testfile);
-        test_oarchive oa(os);
-        oa << boost::serialization::make_nvp("ta", ta);
-    }
-    {
-        test_istream is(testfile, TEST_STREAM_FLAGS);
-        test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
-        ia >> boost::serialization::make_nvp("ta", ta1);
-    }
-    std::remove(testfile);
-    if(*ta != *ta1)
-        return 1;
-
-    return 0;
-}
-</code></pre>
-Difficulties start to occur when the base class is made polymorphic by the designation
-of one or more functions as "virtual".  If a class is polymorphic, the library
-presumes that one will want the ability to serialize a derived class through
-a pointer to the base class.  Included in the macro
-<code>
-BOOST_SERIALIZATION_BASE_OBJECT_NVP
-</code>
-is code which links derived and base class definitions in tables used to serialize
-derived classes through pointers to a polymorphinc base class.  This code requires
-the ability to invoke
-<code>
-static_cast&lt;Base &&gt;(Derived &)
-</code>
-which C++ will only permit from within the derived class if the base class is 
-private or protected. The program will fail to compile with an error message 
-indicating invalid cast.
-<p>
-In order for this
-code compiler the following alteration must be made:
-<pre><code>
-    template<class Archive>
-    void serialize(Archive & ar, const unsigned int version){
-        //ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
-        ar & boost::serialization::make_nvp(
-            "Base",
-            static_cast&lt;Base &&gt;(*this)
-        );
-    }
-</code></pre>
-With this change the program will now compile.
-<p>
-If we made one of the functions of <code>Base></code> <code>virtual</code>
-in order to use the "export" functionality of the serialization library and permit serialization through
-a pointer the the base class, we'll be disappointed. Without the ability to
-cast to the base class, we can't use the functionality.
-<hr>
-<p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2015.
-Distributed under the Boost Software License, Version 1.0. (See
-accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-</i></p>
-</body>
-</html>
@@ -49,7 +49,7 @@ streams even though they have similar syntax rules.
 <ul>
    <li>Archive classes are not kinds of streams though they
    are implemented in terms of streams. This
-    distinction is addressed in <a href="bibliography.html#5">[5]</a> item number 41.
+    distinction is addressed in <a href="bibliography.html#5">[5]</a> item number item 41 .
    <li>We don't want users to insert/extract&nbsp;data
    directly into/from &nbsp;the stream .&nbsp; This could
    create a corrupted archive. Were archives
@@ -29,8 +29,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 </table>
 <hr>
 <dl class="index">
-    <dt><a href="#differences_1_59">Differences from version 1.58</a></dt>
-    <dt><a href="#differences_1_58">Differences from version 1.48</a></dt>
    <dt><a href="#differences_1_45">Differences from version 1.45</a></dt> 
    <dt><a href="#differences_1_43">Differences from version 1.43</a></dt> 
    <dt><a href="#differences_1_42">Differences from version 1.42</a></dt> 
@@ -41,28 +39,12 @@ http://www.boost.org/LICENSE_1_0.txt)
    <dt><a href="#differences_1_35">Differences from version 1.35</a></dt>
    <dt><a href="#differences_1_34">Differences from version 1.34</a></dt> 
    <dt><a href="#differences_1_33">Differences from version 1.33</a></dt> 
-    <dt><a href="#differences_1_32">Differences from version 1.32</a></dt>
+    <dt><a href="#differences_1_32">Differences from version 1.32</a></dt> 
    <dt><a href="#todo">Pending Issues</a></dt>
 </dl>
 As of this writing, there are no known bugs. However, due to compiler/library 
 quirks and or bugs, some tests fail with some combinations of compilers and 
 libraries.
-<h2><a name="differences_1_59"></a>Differences from Boost 1.58</h2>
-<ul>
-<li>Eliminated support for Borland compilers and Microsoft compilers prior to version
-7.1.
-<li>Eliminated support for compilers which do not support Partial Function Template
-Ordering (pfto).
-<li>Added support for "visibility hidden" for GCC compilers.  Shared libraries
-will only expose symbols actually needed rather than all sympols in the library.  This
-should result in smaller shared libraries which are faster to load.
-</ul>
-<h2><a name="differences_1_58"></a>Differences from Boost 1.48</h2>
-<ul>
-<li>Added support for C++11 types such as std::shared_ptr, std::array, and others.
-<li>Implemented the concept of a "Helper" which can be used to implement serialization of types which are otherwise not serializable."
-<li>Made library compatible with C++11,  Compatibility with C++03 has been maintained.
-</ul>
 <h2><a name="differences_1_45"></a>Differences from Boost 1.45</h2>
 Since the release of version 1.42, it has been discovered that binary
 archives created by versions 1.42-1.44 cannot always be read by the
@@ -136,7 +136,7 @@ be made accessible to the serialization library by including:
 friend class boost::serialization::access;
 </code></pre>
 in the class definition.  This latter method should be preferred over the option
-of making the member function public. This will prevent serialization functions from 
+of making member function public. This will prevent serialization functions from 
 being called from outside the library.  This is almost certainly an error.  Unfortunately,
 it may appear to function but fail in a way that is very difficult to find.
 <p>
@@ -196,7 +196,7 @@ templates can be in any of the following namespaces:
 Note that, at first glance, this suggestion may seem to be wrong for compilers which implement
 two phase lookup.  In fact, the serialization library used a perhaps overly clever 
 method to support this rule even for such compilers.  Those with an interest in studying
-this further will find more information in 
+this furter will find more information in 
 <a target=serialization_hpp href="../../../boost/serialization/serialization.hpp">serialization.hpp</a>

 <h3><a name="classmembers">Serialization of Class Members</a></h3>
@@ -262,7 +262,7 @@ the question about what <code style="white-space: normal">const</code> means in
 of serialization. 

 <h4><a name="templates"></a>Templates</h4>
-Implementation of serialization for templates is exactly the same process 
+Implementation serialization for templates is exactly the same process 
 as for normal classes and requires no additional considerations.  Among
 other things, this implies that serialization of compositions of templates
 are automatically generated when required if serialization of the 
@@ -273,7 +273,7 @@ class <code style="white-space: normal">my_t</code>, then serialization for
 <code style="white-space: normal">std::list&lt; boost::shared_ptr&lt; my_t&gt; &gt;</code> is already available
 for use.
 <p>
-For an example that shows how this idea might be implemented for your own
+See for an example that shows how this idea might be implemented for your own
 class templates, see
 <a href="../example/demo_auto_ptr.cpp" target="demo_auto_ptr.cpp">
 demo_auto_ptr.cpp</a>.
@@ -434,7 +434,7 @@ is preferred.  The key to the serialization implementation is that objects are s
 and loaded in exactly the same sequence.  Using the <code style="white-space: normal">&amp;</code> 
 operator and <code style="white-space: normal">serialize</code>
 function guarantees that this is always the case and will minimize the
-occurrence of hard to find errors related to synchronization of 
+occurence of hard to find errors related to synchronization of 
 <code style="white-space: normal">save</code> and <code style="white-space: normal">load</code> 
 functions.
 <p>
@@ -482,7 +482,7 @@ Loading a pointer:
 <ol>
    <li>read a tag from the archive.
    <li>determine the type of object to be created
-    <li>if the object has already been loaded, return its address.
+    <li>if the object has already been loaded, return it's address.
    <li>otherwise, create a new instance of the object
    <li>read the data back in using the operators described above
    <li>return the address of the newly created object.
@@ -496,7 +496,7 @@ and <code style="white-space: normal">&gt;&gt;</code> operators
    <li>Loading the same pointer object multiple times
    results in only one object being created, thereby replicating
    the original pointer configuration. 
-    <li>Structures, such as collections of polymorphic pointers,
+    <li>Structures such as collections of polymorphic pointers,
    are handled with no special effort on the part of users of this library.
 </ul>
 Serialization of pointers of derived types through a pointer to the
@@ -789,10 +789,10 @@ class derived : public base {
    template&lt;class Archive&gt;
    void serialize(Archive &amp; ar, const unsigned int file_version){
        // method 1 : invoke base class serialization
-        ar & boost::serialization::base_object&lt;base&gt;(*this);
+        boost::serialization::base_object&lt;base&gt;(*this);
        // method 2 : explicitly register base/derived relationship
        boost::serialization::void_cast_register&lt;derived, base&gt;(
-            static_cast&lt;derived *&gt;(NULL),
+            static_cast&lt;derived *&gt;=NULL),
            static_cast&lt;base *&gt;(NULL)
        )
    }
@@ -907,11 +907,11 @@ rather than
 <pre><code>
 #include &lt;list&gt;
 </code></pre>
-Since the former includes the latter, this is all that is necessary.
+Since the former includes the latter, this all that is necessary.
 The same holds true for all STL collections as well as templates
 required to support them (e.g. <code style="white-space: normal">std::pair</code>).
 <p>
-As of this writing, the library contains serialization of the following boost classes:
+As of this writing, the library contains serialization of the following boost clases:
 <ul>
  <li>optional
  <li>variant
@@ -121,7 +121,7 @@ the same pointer deserialzed above.  Default object tracking will ensure
 that no more than one instance of the object is created and that the
 pointer returned by multiple deserializations are all the same. Hence,
 regardless of how many instances of <code style="white-space: normal">shared_ptr/shared_count</code>
-corresponding to a particular object are created, they will all point
+corresponding to a particular object are created, the will all point
 to the same object.
 <p>
 Since <code style="white-space: normal">sp_counted_base_impl&lt;P, D&gt;</code> is derived from 
@@ -150,7 +150,7 @@ inline void serialize(
 ){
 }
 </code></pre>
-It would seem we're done, but running the test program,
+It would seem we're done, running the test program,
 <a href="../example/demo_shared_ptr.cpp" target="demo_shared_ptr_cpp">
 demo_shared_ptr.cpp
 </a>,
@@ -197,7 +197,7 @@ void_cast_register&lt;
    boost::detail::sp_counted_base, 
 &gt;();
 </code></pre>
-and we don't have to include a trival serializer for <code style="white-space: normal">sp_counted_base</code>.
+and we don't have to include a trival serializer for <code style="white-space: normal">sp_counted_base</code>
 <p>
 Finally we need to specify name-value pair wrappers if we want to be able
 to use this serialization with XML archives.
@@ -219,9 +219,9 @@ shared pointers:
 BOOST_SHARED_POINTER_EXPORT(T)
 BOOST_SHARED_POINTER_EXPORT_GUID(T, K)
 </pre></code>
-These are specialized versions of the macros used for exporting classes serialized through raw pointers.
+These are specialize versions of the macros used for exporting classes serialized through raw pointers.
 <p>
-Clear, complete, correct and exception safe serialization of smart pointers is going to
+Clearly, complete, correct and exception safe serialization of smart pointers is going to
 be a challenge.  I hope that this implementation provides a useful
 starting point for such an effort.
 <hr>
@@ -25,7 +25,7 @@ http://www.boost.org/LICENSE_1_0.txt)
  </tr>
 </table>
 <hr>
-The purpose of this example is to help clarify the usage of the
+The purpose of this example help clarify the usage of the
 <a href="archives.html"><strong>Archive Concept</strong></a> 
 so that one can implement his own archive classes.  
 <a href="../example/simple_log_archive.hpp" target="simple_archive_hpp">
@@ -42,10 +42,10 @@ names to types and tables which relate base classes to derived
 classes.  Construction, destruction and usage of these variables
 requires consideration of the following issues:
 <ul>
-  <li>Some static data variable and constant entries refer to others.  
+  <li>Some static data variables and constants  entries refer to others.  
  The sequence of initialization cannot be arbitrary but must be in proper
  sequence.</li>
-  <li>A number of static variables aren't referred to explicitly and, without
+  <li>A number of static variables aren't referred explicitly and, without
  special precautions, will be stripped by most code optimizers</li>
  <li>Many of these variables are created by templates and special care must
  be taken to be sure that they are instantiated</li>
@@ -61,7 +61,7 @@ This singleton implementation has the following features:
  <li>
    Any instance will be constructed before any attempt is made to access it.</li>
  <li>
-    Any instance created with a template is guaranteed to be instantiated.
+    Any instance created with a template is guarenteed to be instantiated.
  <li>
    Regardless of whether or not an instance has been explicitly
    referred to, it will not be stripped by the optimizer when the
@@ -70,16 +70,16 @@ This singleton implementation has the following features:
    All instances are constructed before 
    <code style="white-space: normal">main</code> is called
    regardless of where they might be referenced within the program.
-    In a multi-tasking system, this guarantees that there will be no 
+    In a multi-tasking system, this guarentees that there will be no 
    race conditions during the construction of any instance.  No
-    thread locking is required to guarantee this.
+    thread locking is required to guarentee this.
  <li>
    The above implies that any <code style="white-space: normal">const</code>
    instances are thread-safe during the whole program.  Again, no
    thread locking is required.
  <li>
    If a mutable instance is created, and such an instance is modified
-    after main is called in a multi-threading system, there exists
+    after main is called in a mult-threading system, there exists
    the possibility that a race condition will occur.  The serialization
    library takes care that in the few places where a mutable
    singleton is required, it is not altered after 
@@ -138,16 +138,17 @@ In order to be used as
 <a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
 <code style="white-space: normal">
 singleton&lt;T&gt;
-</code>
-</a>, the type T must be default constructable. 
+</code> 
+</a>
+, the type T must be default constructable.
 It doesn't require static variables - though it may have them.
-Since the library guarantees that only one instance of 
+Since the library guarentees that only one instance of 
 <a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
 <code style="white-space: normal">
 singleton&lt;T&gt;
-</code>
-</a> 
-exists and all accesss is through the above static interface
+</code> 
+</a>
+and all accesss is through the above static interface
 functions, common member functions of T become
 the functional equivalent of 
 <code style="white-space: normal">static</code> functions.
@@ -156,24 +157,24 @@ the functional equivalent of
 There are at least two different ways to use this class template.
 Both are used in the serialization library.
 <p>
-The first way is illustrated by an excerpt from the file
+The first way is illustrated by and excerpt from the file
 <code style="white-space: normal"><a target="extended_type_info" href="../src/extended_type_info.cpp">extended_type_info.cpp</a></code>.
 which contains the following code:

 <pre><code>
-typedef std::set&lt;const extended_type_info *, key_compare&gt; ktmap;
+typedef std::set<const extended_type_info *, key_compare> ktmap;
 ...
 void
 extended_type_info::key_register(const char *key) {
    ...
-    result = singleton&lt;ktmap&gt;::get_mutable_instance().insert(this);
+    result = singleton<ktmap>::get_mutable_instance().insert(this);
    ...
 }
 </code></pre>
 Just by referring to the singleton instance anywhere in the program
-will guarantee that one and only one instance for the specified
+will guarentee that one and only one instance for the specified
 type (<code style="white-space: normal">ktmap</code> in this example) 
-will exist throughout the program.  There is no need for any other
+will exist throughout the program.  There is no need for anyother
 declaration or definition.
 <p>
 A second way is to use 
@@ -216,7 +217,7 @@ extended_type_info_typeid&lt;T&gt;::get_const_instance()
 </code></pre>

 Again, including one or more of the above statements anywhere
-in the program will guarantee that one and only one instance
+in the program will guarentee that one and only one instance
 is created and referred to.

 <h3><a name="multithreading">Multi-Threading</a></h3>
@@ -224,9 +225,10 @@ This singleton CAN be safely used in multi-threading applications if one
 is careful follow a simple rule:
 <p>
 <b>Do not call get_mutable_instance when more than one thread is running!</b>
+<'>
 All singletons used in the serialization library follow this rule.  
 In order to help detect accidental violations of this rule there
-exist singleton lock/unlock functions.
+exists an singleton lock/unlock functions.
 <pre><code>
 void boost::serialization::singleton_module::lock();
 void boost::serialization::singleton_module::unlock();
@@ -240,7 +242,7 @@ alteration of static variables before
 <code style="white-space: normal">main</code> is called. 
 The <code style="white-space: normal">lock()</code> and
 <code style="white-space: normal">unlock()</code> are "global"
-in that they affect ALL the singletons defined by this template.
+in they affect ALL the singletons defined by this template.
 All serialization tests invoke <code style="white-space: normal">lock()</code>
 at the start of the progam.  For programs compiled in release
 mode these functions have no effect.
@@ -33,9 +33,9 @@ operators:
  <dt><code>static_cast&lt;T *<&gt;(U *)<br>static_cast&lt;T &<&gt;(U &)</code></dt>
  <dd>
    <ul>
-      <li>required if neither T nor U are polymorphic
+      <li>required if neither T nor U are not polymorphic
      <li>permitted in other cases.
-      <li>fails to detect erroneous casts of polymophic pointers/references at runtime.
+      <li>fails to detect erroneas casts of polymophic pointers/references at runtime.
      <li>does not permit "cross casting"
      <li>inline function calls can be optimized away during compile time.
    </ul>
@@ -46,7 +46,7 @@ operators:
    <ul>
      <li>permitted if either T or U are polymorphic
      <li>prohibited in other cases.
-      <li>throws exception on detecting erroneous casts of polymorphic pointers/references
+      <li>throws exception on detecting erroneas casts of polymorphic pointers/references
          at runtime.
      <li>permits "cross casting"
      <li>cannot optimise inline virtual functions at compile time.
@@ -91,14 +91,14 @@ template&lt;class T&gt;
 bool is_storable(T &amp;t){
    // what type of cast to use here?

-    // this fails at compile time when T == base2
+    // this fails at compiler time when T == base2
    // return static_cast&lt;base1 &amp;&gt;(t).is_storable();

-    // this fails at compile time when T == top
+    // this fails at compiler time when T == top
    // otherwise it works but cannot optimize inline function call
    // return dynamic_cast&lt;base1 &amp;&gt;(t).is_storable();

-    // this always works - and is guaranteed to generate the fastest code !
+    // this always works - and is guarenteed to generate the fastest code !
    return (boost::smart_cast_reference&lt;base1 &amp;&gt;(t)).is_storable();
 }

@@ -121,7 +121,7 @@ The serialization library includes a mix of classes which use
 both static polymorphism (<strong>CRTP</strong>) and dynamic
 polymorphism via virtual functions.  <code style="white-space: normal">smart_cast</code> 
 was written to address the more problematic manifestations of the
-situation exemplified above.
+situation exmplified above.

 <h3>Usage</h3>
 The following syntax is supported:
@@ -134,14 +134,14 @@ Note that the above syntax doesn't include
 <pre><code>
 smart_cast&lt;Target &amp; &gt(Source &amp; s)
 </code></pre>
-but the same functionality is supported with the following special syntax
+but the same functionality is supported the the following special syntax
 <pre><code>
 smart_cast_reference&lt;Target &amp;&gt(Source &amp; s)
 </code></pre>

 <h3>Requirements</h3>
 <code style="white-space: normal">smart_cast</code> can be used only on compilers that support partial
-template specialization or on types for which the
+template specialization or on types for which have be specified with the
 macro <code style="white-space: normal">
 BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(&lt;type&gt;)</code>
 has been applied.
@@ -28,7 +28,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 <dl class="page-index">
  <dt><a href="#objecttracking">Object Tracking</a>
  <dt><a href="#classinfo">Class Information</a>
-  <dt><a href="#helpersupport">Helper Support</a>
  <dt><a href="#portability">Archive Portability</a>
  <dl class="page-index">
    <dt><a href="#numerics">Numerics</a>
@@ -97,7 +96,7 @@ and a likely source of very subtle bugs.
 Unfortunately, implementation issues currently prevent the detection of this kind of
 error when the data item is wrapped as a name-value pair.
 <p>
-A similar problem can occur when different objects are loaded to an address
+A similar problem can occur when different objects are loaded to and address
 which is different from the final location:
 <pre><code>
 template&lt;class Archive&gt;
@@ -112,7 +111,7 @@ void load(boost::basic_oarchive  &amp; ar, const unsigned int version) const
 </code></pre>
 In this case, the address of <code>x</code> is the one that is tracked rather than
 the address of the new item added to the set.  Left unaddressed
-this will break the features that depend on tracking such as loading an object through a pointer.
+this will break the features that depend on tracking such as loading object through a pointer.
 Subtle bugs will be introduced into the program.  This can be
 addressed by altering the above code thusly:

@@ -137,7 +136,7 @@ values are duplicated, overhead associated with object tracking can
 be eliminated by setting the object tracking class serialization trait
 appropriately.
 <p>
-By default, data types designated primitive by the
+By default, data types designated primitive by 
 <a target="detail" href="traits.html#level">Implementation Level</a>
 class serialization trait are never tracked. If it is desired to
 track a shared primitive object through a pointer (e.g. a
@@ -156,96 +155,6 @@ redundant save/load operations.
 BOOST_CLASS_TRACKING(my_virtual_base_class, boost::serialization::track_always)
 </code></pre>

-<h3><a name="helpersupport">Helper Support</a></h3>
-Some types, specially those with complicated lifetime behavior or limited
-access to their internal state, might need or benefit from elaborate serialization
-algorithms.  The prinicple motivating case is that of shared_ptr.  As instances
-are loaded, they have to be "matched up" with any other instances which have
-already been loaded.  Thus, a table of previously loaded instances has to be
-maintained while the archive containing the shared_ptr instances is being loaded.
-Without maintaining such a table, the shared_ptr would be a serializable type.
-<p>
-To implement this facility, one declares a <i>helper object</i>
-associated to the current archive that can be used to store contextual
-information relevant to the particular type serialization algorithm.
-
-<pre><code>
-template<class T>
-class shared_ptr
-{
-   ...
-};
-
-BOOST_SERIALIZATION_SPLIT_FREE(shared_ptr)
-
-class shared_ptr_serialization_helper
-{
-  // table of previously loaded shared_ptr
-  // lookup a shared_ptr from the object address
-  shared_ptr<T> lookup(const T *);
-  // insert a new shared_ptr
-  void insert<shared_ptr<T> >(const shared_ptr<T> *);
-};
-
-namespace boost {
-namespace serialization {
-
-template&lt;class Archive&gt;
-void save(Archive &amp; ar, const shared_ptr &amp; x, const unsigned int /* version */)
-{
-    // save shared ptr
-    ...
-}
-
-template&lt;class Archive&gt;
-void load(Archive &amp; ar, shared_ptr &amp; x, const unsigned int /* version */)
-{
-    // get a unique identifier.  Using a constant means that all shared pointers
-    // are held in the same set.  Thus we detect handle multiple pointers to the
-    // same value instances in the archive.
-    const void * shared_ptr_helper_id = 0;
-
-    shared_ptr_serialization_helper &amp; hlp =
-        ar.template get_helper&lt;shared_ptr_serialization_helper&gt;(helper_instance_id);
-
-    // load shared pointer object
-    ...
-
-    shared_ptr_serialization_helper &amp; hlp =
-        ar.template get_helper&lt;shared_ptr_serialization_helper&gt;(shared_ptr_helper_id);
-
-    // look up object in helper object
-    T * shared_object hlp.lookup(...);
-
-    // if found, return the one from the table
-
-    // load the shared_ptr data
-    shared_ptr<T> sp = ...
-
-    // and add it to the table
-    hlp.insert(sp);
-    // implement shared_ptr_serialization_helper load algorithm with the aid of hlp
-}
-
-} // namespace serialization
-} // namespace boost
-</code></pre>
-<code style="white-space: normal">get_helper&lt;shared_ptr_serialization_helper&gt;();</code>
-creates a helper object associated to the archive the first time it is invoked;
-subsequent invocations return a reference to the object created in the first
-place, so that <code style="white-space: normal">hlp</code> can effectively be
-used to store contextual information persisting through the serialization
-of different <code style="white-space: normal">complex_type</code> objects on
-the same archive.
-
-<p>
-Helpers may be created for saving and loading archives.
-The same program might have several different helpers or the same helper instantiated
-separately from different parts of the program.  This is what makes the helper_instance_id
-necessary.  In principle it could be any unique integer. In practice it seems
-easiest to use the address of the serialization function which contains it. The
-above example uses this technique.
-
 <h3><a name="classinfo">Class Information</a></h3>
 By default, for each class serialized, class information is written to the archive.
 This information includes version number, implementation level and tracking
@@ -267,7 +176,7 @@ in this manner comes at a cost.  Once archives are released to users, the
 class serialization traits cannot be changed without invalidating the old
 archives.  Including the class information in the archive assures us
 that they will be readable in the future even if the class definition
-is revised.  A light weight structure such as a display pixel might be
+is revised.  A light weight structure such as display pixel might be
 declared in a header like this:

 <pre><code>
@@ -295,14 +204,14 @@ BOOST_CLASS_TRACKING(pixel, boost::serialization::track_never)
 </code></pre>

 <h3><a name="portability">Archive Portability</a></h3>
-Several archive classes create their data in the form of text or a portable binary format.  
-It should be possible to save such a class on one platform and load it on another.  
+Several archive classes create their data in the form of text or portable a binary format.  
+It should be possible to save such an of such a class on one platform and load it on another.  
 This is subject to a couple of conditions.
 <h4><a name="numerics">Numerics</a></h4>
 The architecture of the machine reading the archive must be able hold the data
 saved.  For example, the gcc compiler reserves 4 bytes to store a variable of type
 <code style="white-space: normal">wchar_t</code> while other compilers reserve only 2 bytes.  
-So it's possible that   a value could be written that couldn't be represented by the loading program.  This is a
+So its possible that   a value could be written that couldn't be represented by the loading program.  This is a
 fairly obvious situation and easily handled by using the numeric types in
 <a target="cstding" href="../../../boost/cstdint.hpp">&lt;boost/cstdint.hpp&gt;</a>
 <P>
@@ -387,7 +296,7 @@ not wrapped in a in a <a target="detail" href="wrappers.html#nvp">name-value pai
 be trapped at compile time. The system is implemented in such a way that for other archive classes,
 just the value portion of the data is serialized. The name portion is discarded during compilation.
 So by always using <a target="detail" href="wrappers.html#nvp">name-value pairs</a>, it will
-be guaranteed that all data can be serialized to all archive classes with maximum efficiency.
+be guarenteed that all data can be serialized to all archive classes with maximum efficiency.

 <h3><a name="export">Exporting Class Serialization</a></h3>
 <a target="detail" href="traits.html#export">Elsewhere</a> in this manual, we have described 
@@ -402,7 +311,7 @@ requirement.
 In C++, usage of code not explicitly referred to is implemented via
 virtual functions.  Hence, the need for export is implied by the 
 usage of a derived class that is manipulated via a pointer or
-reference to its base class.
+reference to it's base class.

 <p>
 <code style="white-space: normal">BOOST_CLASS_EXPORT</code> in the same
@@ -414,7 +323,7 @@ archive class headers are included, then no code will be instantiated.
 <p>
 Note that the implemenation of this functionality requires
 that the <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
-macro appear <b>after</b> the inclusion of any archive
+macro appear <b>after</b> and the inclusion of any archive
 class headers for which code is to be instantiated.
 So, code that uses <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
 will look like the following:
@@ -427,7 +336,7 @@ will look like the following:
 BOOST_CLASS_EXPORT(a)
 ... // other class headers and exports
 </code></pre>
-This will be true regardless of whether the code is part
+This will be true regardless of whether the is part
 of a stand alone executable, a static library or
 a dyanmic or shared library.  
 <p>
@@ -456,14 +365,14 @@ one can include headers for just the
 <p>
 Strictly speaking, export should not be necessary if all pointer serialization
 occurs through the most derived class.  However, in order to detect
-what would be a catastophic error, the library traps ALL serializations through
-a pointer to a polymorphic class which are not exported or otherwise registered.
+what would be catastophic error, the library traps ALL serializations through
+a pointer to a polymorphic which are not exported or otherwise registered.
 So, in practice, be prepared to register or export all classes with one
 or more virtual functions which are serialized through a pointer. 

 <p>
 Note that the implementation of this functionality depends upon vendor
-specific extensions to the C++ language.  So, there is no guaranteed portability
+specific extensions to the C++ language.  So, there is no guarenteed portability
 of programs which use this facility.  However, all C++ compilers which
 are tested with boost provide the required extensions.  The library
 includes the extra declarations required by each of these compilers.
@@ -473,7 +382,7 @@ these extensions or something equivalent.
 <h3><a name="static_libraries">Static Libraries and Serialization</a></h3>
 Code for serialization of data types can be saved in libraries
 just as it can for the rest of the type implementation.
-This works well, and can save a huge amount of compilation time.
+This works well, and can save huge amount of compilation time.
 <ul>
 <li>Only compile serialization definitions in the library.
 <li>Explicitly instantiate serialization code for ALL
@@ -549,9 +458,9 @@ guidelines:
  <li>Don't include <code>inline</code> code in classes used in DLLS.
 This will generate duplicate code in the DLLS and mainline. This
 needlessly duplicates code.  Worse, it makes is possible for 
-different versions of the same code to exist simultaneously.  This
+different versions of the same code exist simultaneously.  This
 type of error turns out to be excruciatingly difficult to debug.
-Finally, it opens the possibility that a module being referred to
+Finally, it opens the possibility that module being referred to
 might be explictly unloaded which would (hopefully) result in
 a runtime error. This is another bug that is not always 
 reproducible or easy to find. For class member templates use something like
@@ -578,16 +487,16 @@ template myclass::serialize(boost::archive::text_iarchive & ar, const unsigned i
 </code></pre>
 in the implementation file.  This will result in generation of all code
 required in only one place.  The library does not detect this type of error for you.
-  <li>If DLLS are to be loaded and unloaded explicitly (e.g. using <code>dlopen</code> in *nix or 
+  <li>If DLLS are to be loaded an unloaded explicitly (e.g. using <code>dlopen</code> in *nix or 
 <code>LoadLibrary</code> in Windows).  Try to arrange that they are unloaded in the reverse
-sequence.  This should guarantee that problems are avoided even if the
-above guideline hasn't been followed.
+sequence.  This should guarentee that problems are avoided even if the
+above guidline hasn't been followed.

 </ul>

 <h3><a name="plugins">Plugins</a></h3>
 In order to implement the library, various facilities for runtime
-manipulation of types at runtime were required.  These
+manipulation of types are runtime were required.  These
 are <a target="detail" href="extended_type_info.html"><code>extended_type_info</code></a>
 for associating classes with external identifying strings (<b>GUID</b>)
 and <a target="detail" href="void_cast.html"><code>void_cast</code></a>
@@ -617,33 +526,33 @@ BOOST_CLASS_EXPORT(a)
 ... // other class headers and exports
 </code></pre>

-With this in place, one can construct, serialize and destroy a class
-about which is known only the <b>GUID</b> and a base class.
+With this in place, one can construct, serialize and destroy
+about which only is know the <b>GUID</b> and a base class.


 <h3><a name="multi_threading">Multi-Threading</a></h3>
 The fundamental purpose of serialization would conflict with multiple 
-threads concurrently writing/reading from/to a single open archive instance.
-The library implementation presumes that the application avoids such a situtation.
+thread concurrently writing/reading from/to a single open archive instance.
+The library implementation presumes that the application avoids such an situtation.
 <p>
 However, Writing/Reading different archives simultaneously
 in different tasks is permitted as each archive instance is (almost) 
 completely independent from any other archive instance.  The only shared 
-information is some type tables which have been implemented using a 
+information are some type tables which have been implemented using a 
 lock-free thread-safe 
 <a target="detail" href="singleton.html">
 <code style="white-space: normal">singleton</code>
 </a>
 described elsewhere in this documentation.
 <p>
-This singleton implementation guarantees that all of this shared
+This singleton implementation guarentees that all of this shared
 information is initialized when the code module which contains
-it is loaded.  The serialization library takes care to
+them is loaded.  The serialization library takes care to
 ensure that these data structures are not subsequently
 modified. The only time there could be a problem would
 be if code is loaded/unloaded while another task is
 serializing data.  This could only occur for types whose 
-serialization is implemented in a dynamically loaded/unloaded DLL
+serialization is implemented in a dynamically loaded/unload DLL
 or shared library.  So if the following is avoided:
 <ul>
    <li>Accessing the same archive instance from different tasks.
@@ -78,7 +78,7 @@ type but still of distinct type.

 <h3>Implemenation</h3>
 <code style="white-space: normal">BOOST_STRONG_TYPEDEF</code> is a macro
-which generates a class named "name" which wraps an instance of its
+which generates a class named "name" wraps and instance of its
 primitive type and provides appropriate conversion operators in order
 to make the new type substitutable for the one that it wraps.

@@ -43,12 +43,13 @@ Currently there is a portable binary archive in the examples directory.
 It is not regularly submitted to the exhaustive boost testing regimen
 but it is tested occasionally and has been used in production code.
 <p>
-It's missing the following:
+Its missing the following:
 <ul>
  <li>Addition of portable floating point types.  This is not trivial.  In addition to
  handling floating point types of varying sizes, It requires
  handling invalid floating point numbers (NaNs) in a portable manner.
-  <li>Integration into the Boost testing regimen similar to the other archive classes.
+  <li>Some way to test archive portability within the Boost testing regimen.
+  <li>Integration into the Boost testing similar to the other archive classes.
 </ul>

 <h2><a name="performancetesting"></a>Performance Testing and Profiling</h2>
@@ -66,13 +67,13 @@ which shows the results of each test and links to the actual
 profile.
 <p>
 The first thing I did was include some of the serialization library tests.
-It became immediately apparent that these tests were totally unsuitable
+It became immediatly apparent that these tests were totally unsuitable
 for performance testing and that new tests needed to be written for this 
 purpose.  These tests would highlight the location of any performance
 bottlenecks in the serialization library.  Whenever I've subjected my
-code in the past to this type of analysis, I've always been surprised
+code in the past to this type of analysis, I've always been suprised
 to find bottlenecks in totally unanticipated places and fixing those
-has always led to large improvements in performance.  I expect that
+has always lead to large improvements in performance.  I expect that
 this project would have a huge impact on the utility of the serialization
 library.

@@ -80,10 +81,10 @@ library.

 It has been suggested that a useful feature of the library would be
 the ability to create "older versions" of archives.  Currently,
-the library permits one to make programs that are guaranteed
+the library permits one make programs that are guarenteed
 the ability to load archives with classes of a previous version. 
-But there is no way to save classes in accordance with a
-previous version.  At first I dismissed this as a huge project
+But there is not way to save classes in accordance with a
+previous version.  At first I dismissed this a a huge project
 with small demand.  A cursory examination of the code revealed
 that this would not be very difficult.  It would require some
 small changes in code and some additional tests.  Also it
@@ -100,7 +101,7 @@ to use the library without it.  The example used for testing is an
 <code style="white-space: normal">extended_typeinfo</code> 
 implemenation which presumes that all classes names have been exported. 
 So, to make this library compatible for platforms without RTTI, 
-a set of tests, examples and new manual section would have to be created.
+a set of tests, examples and new manual section would have to be created

 <hr>
 <p>Revised 1 November, 2008 
@@ -38,7 +38,7 @@ http://www.boost.org/LICENSE_1_0.txt)
  <dt><a href="#compiletime_messages">Compile Time Warnings and Errors</a>
 </dl>
 Serialization of data depends on the type of the data.  For example, for
-primitive types such as <code style="white-space: normal">int</code>, it wouldn't make sense to save
+primitive types such as an <code style="white-space: normal">int</code>, it wouldn't make sense to save
 a version number in the archive. Likewise, for a data type that is never
 serialized through a pointer, it would (almost) never make sense to track
 the address of objects saved to/loaded from the archive as it will never
@@ -232,12 +232,12 @@ statisfactory for our purposes for the following reasons:
  <li>There might be classes locally defined in different code modules
  that have the same name. 
  <li>There might be classes with different names that we want to
-  consider equivalent for purposes of serialization.
+  consider equivalent for purposes of of serialization.
 </ul>
 <p>
 So in the serialization library, this is addressed by invoking
 <code style="white-space: normal">BOOST_CLASS_EXPORT_KEY2(my_class, "my_class_external_identifier")</code>
-in the header file which declares the class.
+in the header file which declares he class.
 In a large majority of applications, the class name works just fine
 for the external identifier string so the following short cut is
 defined -
@@ -248,8 +248,8 @@ programs which do not use DLLS, one can specify
 <code style="white-space: normal">BOOST_CLASS_EXPORT(my_class)</code>
 or
 <code style="white-space: normal">BOOST_CLASS_EXPORT_GUID(my_class, "my_class_external_identifier")</code>
-in either the declaration header or definition.  These macros
-expand to invocation of both of the macros described above.
+in either he declaration header or definition.  These macros
+expand to invocation of the of both of the macros described above.
 <i>(<b>GUID</b> stands for <b>G</b>lobally <b>U</b>nique <b>ID</b>entfier.)</i>
 <p>
 <i>(<a target="detail" href="special.html#export">Elsewhere</a>
@@ -267,7 +267,7 @@ in more than one module (or DLL).

 <h3><a name="abstract">Abstract</a></h3>
 When serializing an object through a pointer to its base class,
-the library needs to determine whether or not the base is abstract
+the library needs to determine whether or not the bas is abstract
 (i.e. has at least one virtual function).  The library uses the
 type trait macro <code style="white-space: normal">BOOST_IS_ABSTRACT(T)</code>
 to do this.  Not all compilers support this type trait and corresponding
@@ -333,9 +333,10 @@ This is illustrated by the test program
 Other implementations are possible and might be necessary for
 certain special cases.

+version.hpp</a>.  
 <h3><a name="wrappers">Wrappers</a></h3>
-Archives need to treat wrappers differently from other types since, for example,
-they usually are non-const objects while output archives require that any
+Archives need to treat wrappers diffently from other types since, for example,
+they usually are non-const object while output archives require that any
 serialized object (with the exception of a wrapper) be const. 

 This header file <a href="../../../boost/serialization/wrapper.hpp">wrapper.hpp</a>
@@ -470,7 +471,7 @@ struct tracking_level&lt;nvp&lt;T&gt; &gt;
 #endif
 </code></pre>
 This can be problematic when one wants to make his code <strong>and archives</strong>
-portable to other platforms.  It means the objects will be serialized differently
+portable to other platforms.  It means the she objects will be serialized differently
 depending on the platform used.  This implies that objects saved from one platform
 won't be loaded properly on another.  In other words, archives won't be portable.
 <p>
@@ -516,13 +517,13 @@ and template parameters should be assigned according to the following table:
 Some serialization traits can conflict with other ones.  Sometimes these conflicts
 will result in erroneous behavior (E.G. creating of archives which could not be read)
 and other times they represent a probable misconception on the part of the
-library user which could result in suprising behavior.  To the extent possible,
+library user which could result in suprising behavior.  The extent possible,
 these conflicts are detected at compile time and errors (BOOST_STATIC_ASSERT) 
-or warnings (BOOST_STATIC_WARNING) are generated. They are generated in a
-compiler dependent manner which should show a chain of instantiation
+or warnings (BOOST_STATIC_WARNING) are generated. The are generated in a
+compiler dependent way manner which should show an chain of instantiation
 to the point where the error/warning is detected.  Without this capability,
 it would be very hard to track down errors or unexpected behavior in library
-usage.  Here is a list of the conflicts trapped:
+usage.  Here is list of the conflicts trapped:

 <dl>
 <dt><h2><a name="object_level">object_level</a> - error</h2></dt>
@@ -631,9 +632,9 @@ class K {
  discovered that when loading the archives made in the last month (reading the 
  log). Things don't work. The second log entry is always the same as the 
  first. After a series of very long and increasingly acrimonius email exchanges, 
-it's discovered 
-  that programmer(3) accidently broke programmer(2)'s code .This is because by 
-  serializing via a pointer, the "log" object is now being tracked.  This is because
+its discovered 
+  that programmer (3) accidently broke programmer(2)'s code .This is because by 
+  serializing via a pointer, the "log" object now being tracked.  This is because
  the default tracking behavior is "track_selectively".  This means that class
  instances are tracked only if they are serialized through pointers anywhere in
  the program. Now multiple saves from the same address result in only the first one 
@@ -641,11 +642,11 @@ it's discovered
  data might have been changed.  When it comes time to load the data, all instances of the log record show the same data.
  In this way, the behavior of a functioning piece of code is changed due the side
  effect of a change in an otherwise disjoint module.
-  Worse yet, the data has been lost and cannot be recovered from the archives.
+  Worse yet, the data has been lost and cannot not be now recovered from the archives.
  People are really upset and disappointed with boost (at least the serialization system).
  <p>
  <li>
-  After a lot of investigation, it's discovered what the source of the problem is
+  After a lot of investigation, it's discovered what the source of the problem
  and class construct_from is marked "track_never" by including:
 <code style="white-space: normal"><pre>
 BOOST_CLASS_TRACKING(construct_from, track_never) 
@@ -659,7 +660,7 @@ have its own distinct raw pointer. This will break
 <code style="white-space: normal">shared_ptr</code> and cause a memory leak.  Again,
 The cause of this problem is very far removed from the point of discovery.  It could 
 well be that the problem is not even discovered until after the archives are loaded.
-Now we not only have a difficult to find and fix program bug, but we have a bunch of
+Now we not only have difficult to find and fix program bug, but we have a bunch of
 invalid archives and lost data.
 </ol>

@@ -672,7 +673,7 @@ invalid archives and lost data.
 ar &lt;&lt; x; 
 </pre></code>
  <p>
-  <li>The programmer curses (another %^&*&* hoop to jump through). He's in a 
+  <li>The programmer curses (another %^&*&* hoop to jump through). If he's in a 
  hurry (and who isn't) and would prefer not to <code style="white-space: normal">const_cast</code>
  - because it looks bad.  So he'll just make the following change an move on. 
 <code style="white-space: normal"><pre>
@@ -696,8 +697,8 @@ ar &lt;&lt; x
  <p>
  He's mildly annoyed now he tries the following: 
  <ul>
-    <li>He considers making f() a const - but presumably that shifts the const 
-    error to somewhere else. And he doesn't want to fiddle with "his" code to 
+    <li>He considers making f() a const - but presumable that shifts the const 
+    error to somewhere else. And his doesn't want to fiddle with "his" code to 
    work around a quirk in the serializaition system 
    <p>
    <li>He removes the <code style="white-space: normal">const</code>
@@ -747,7 +748,7 @@ Note that in this second scenario

 It's true that these messages may sometimes flag code that is currently correct and
 that this may be annoying to some programmers.  However, this example illustrates
-my view that these messages are useful and that any such annoyance is a small price to
+my view that these messages are useful and that any such annoyance is small price to
 pay to avoid particularly vexing programming errors.

 </dd>
@@ -764,7 +765,7 @@ level <= object_serializable.
 in this case, indication that an object is tracked is
 not stored in the archive itself - see level == object_serializable.
 Since class information is not saved in the archive, the existence
-or absence of the operation ar << T * anywhere else in the 
+or absense of the operation ar << T * anywhere else in the 
 program is used to infer that an object of this type should be tracked.
 <p>
 A problem arises when a program which reads an archive
@@ -327,7 +327,7 @@ clas pointer may require explicit enumeration of the derived
 classes to be serialized. This is referred to as "registration" or "export"
 of derived classes.  This requirement and the methods of
 satisfying it are explained in detail
-<a href="serialization.html#derivedpointers">here</a>.
+<a href="serialization.html#derivedpointers">here</a>
 <p>
 All this is accomplished automatically by the serialization
 library.  The above code is all that is necessary to accomplish
@@ -569,7 +569,7 @@ anywhere in the program - a memory leak.
 There are couple of ways of fixing this.  One way is to explicitly manage the bus stops.
 However, a more robust and transparent is to use 
 <code style="white-space: normal">shared_ptr</code> rather than raw pointers. Along
-with serialization implementations for the Standard Library, the serialization library
+with serialization implemenations for the Standard Library, the serialization library
 includes implementation of serialization for 
 <code style="white-space: normal">boost::shared ptr</code>.  Given this, it should be
 easy to alter any of these examples to eliminate the memory leak. This is left 
@@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 C++ includes the operator <code style="white-space: normal">dynamic_cast&lt;T&gt;(U * u)</code>
 for casting a pointer at runtime between two related types. However, this can only be 
 used for polymorphic classes.  That is, it can only be used with related classes which have at least one virtual function.
-Limiting the serializaton of pointers to only such classes would diminish the applicability
+Limiting the serializaton of pointers to only such class would diminish the applicability
 of the library.

 <h3>Usage</h3>
@@ -46,7 +46,7 @@ const void_cast_detail::void_caster &
 void_cast_register(
    Derived const * derived = NULL, 
    Base * const base = NULL
-);
+)
 </code></pre></h4></dt>
 <dd>
 This function "registers" a pair of related types.  It stores the fact that
@@ -43,7 +43,7 @@ the <A href="traits.html#wrappers"><code>is_wrapper</code></a> trait for
 these wrapper classes is set to true.

 <h3><a name="binaryobjects">Binary Objects</a></h3>
-A binary object is just a sequence of bytes stored as raw
+A binary object is just an sequence of bytes stored as raw
 binary data.  This would most likely be used for a large amount
 of "light weight" data such as a pixel map or embedded binary file.
 The header file 
@@ -59,7 +59,7 @@ which will construct a temporary binary object that can be serialized just like
 Its default serialization is to use archive class primitives 
 <code style="white-space: normal">save_binary</code> and <code>load_binary</code>.  
 Note that it doesn't allocated any storage or create any objects.
-Its sole purpose is to pass the data size and address as a pair to the archive class.  
+Its sole purpose is to pass the data size and address as pair to the archive class.  


 <h3><a name="arrays">Arrays</a></h3>
@@ -91,7 +91,7 @@ public:
 };
 </code></pre>
 that can be serialized just like any other object.
-Its default serialization is to serialize each array element.  
+Its default serialization is to use serialize each array element.  
 Note that it doesn't allocated any storage or create any objects.
 Its sole purpose is to pass the data type, size and address to the archive class.

@@ -171,7 +171,7 @@ xml_oarchive & operator&(const boost::serialization::nvp<T> & t)
 }
 </code></pre>
 The most obvious and convient name to assign to as the XML data item name
-is - surprise! - the name of the C++ class data member.  So our serialization
+is - surpise! - the name of the C++ class data member.  So our serialization
 code will look like:
 <pre><code>
 ar & make_nvp("my_variable", my_variable);
@@ -11,32 +11,47 @@ project libs/serialization/example
    : requirements <library>../build//boost_serialization
    ;

-import ../util/test :
-    run-template
-    run-invoke
-    run-winvoke
-    test-bsl-run-no-lib
-    test-bsl-run
-    test-bsl-run_archive
-    test-bsl-run_files
-    test-bsl-run_polymorphic_archive
-;
+rule demo_bsl_run ( demo-name : othersources * : requirements * )
+{
+    return [ run
+        # sources
+            $(demo-name).cpp 
+            $(othersources).cpp
+        : # command
+        : # input files
+        : # requirements
+            # toolset suppress-warnings
+            <toolset>gcc:<cxxflags>"-Wno-non-virtual-dtor -Wno-ctor-dtor-privacy"
+            <toolset>msvc-8.0:<cxxflags>"-wd4996"
+            <toolset>borland:<cxxflags>"-w-8080 -w-8071 -w-8057 -w-8062 -w-8008 -w-0018 -w-8066"
+            # toolset optimizations
+            <toolset>gcc:<cxxflags>"-ftemplate-depth-255"
+            <toolset>msvc:<cxxflags>"-Gy"
+            # toolset shared library support
+            <toolset>como,<runtime-link>shared:<build>no
+            <toolset>msvc,<stdlib>stlport,<runtime-link>shared:<build>no
+            <toolset>cw,<runtime-link>static:<build>no
+            $(requirements)
+         : # test name
+            $(demo-name)
+       ]
+    ;
+}

 test-suite "demo-suite" :
    # demos
-    [ test-bsl-run demo ]
-    [ test-bsl-run demo_auto_ptr ]
-    [ test-bsl-run demo_exception ]
-    [ test-bsl-run demo_fast_archive ]
-    [ test-bsl-run demo_log : log_archive ]
-    [ test-bsl-run demo_pimpl : demo_pimpl_A ]
-    [ test-bsl-run demo_polymorphic : demo_polymorphic_A ]
-    [ test-bsl-run demo_portable_archive : portable_binary_iarchive portable_binary_oarchive ]
-    [ test-bsl-run demo_shared_ptr ]
-    [ test-bsl-run demo_simple_log ]
-    [ test-bsl-run demo_trivial_archive ]
-    [ test-bsl-run demo_xml ]
-    [ test-bsl-run demo_xml_save ]
-    [ test-bsl-run demo_xml_load : : : <dependency>demo_xml_save ]
+    [ demo_bsl_run demo ]
+    [ demo_bsl_run demo_auto_ptr ]
+    [ demo_bsl_run demo_exception ]
+    [ demo_bsl_run demo_log : log_archive ]
+    [ demo_bsl_run demo_pimpl : demo_pimpl_A ]
+    [ demo_bsl_run demo_polymorphic : demo_polymorphic_A ]
+    [ demo_bsl_run demo_portable_archive : portable_binary_iarchive portable_binary_oarchive ]
+    [ demo_bsl_run demo_shared_ptr ]
+    [ demo_bsl_run demo_simple_log ]
+    [ demo_bsl_run demo_trivial_archive ]
+    [ demo_bsl_run demo_xml ]
+    [ demo_bsl_run demo_xml_save ]
+    [ demo_bsl_run demo_xml_load : : <dependency>demo_xml_save ]
 ;

@@ -1,5 +1,5 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// test_forward_list.cpp
+// test_derived_class.cpp

 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
 // Use, modification and distribution is subject to the Boost Software
@@ -10,42 +10,41 @@

 #include <cstddef> // NULL
 #include <fstream>
+
 #include <cstdio> // remove
+#include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{ 
    using ::remove;
 }
 #endif

-#include <boost/config.hpp>
-#include <boost/serialization/forward_list.hpp>
-
-#include <boost/archive/archive_exception.hpp>
 #include "test_tools.hpp"

-#include "A.hpp"
+#include "B.hpp"
 #include "A.ipp"

-int test_main( int /* argc */, char* /* argv */[] )
+int test_main( int argc, char* argv[] )
 {
-    const char * testfile = boost::archive::tmpnam(NULL);
-    std::forward_list<A> aslist;
-    aslist.push_front(A());
-    aslist.push_front(A());
+  const char * testfile = boost::archive::tmpnam(NULL);
+  
+  BOOST_REQUIRE(NULL != testfile);
+
+    B b, b1;
+
    {   
        test_ostream os(testfile, TEST_STREAM_FLAGS);
        test_oarchive oa(os, TEST_ARCHIVE_FLAGS);
-        oa << boost::serialization::make_nvp("aslist", aslist);
+        oa << boost::serialization::make_nvp("b", b);
    }
-    std::forward_list<A> aslist1;{
+    {
        test_istream is(testfile, TEST_STREAM_FLAGS);
        test_iarchive ia(is, TEST_ARCHIVE_FLAGS);
-        ia >> boost::serialization::make_nvp("aslist", aslist1);
+        ia >> boost::serialization::make_nvp("b1", b1);
    }
-    BOOST_CHECK(aslist == aslist1);
+    BOOST_CHECK(b == b1);
    std::remove(testfile);
    return EXIT_SUCCESS;
 }

 // EOF
-
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_TEST_A_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -20,7 +20,6 @@
 #include <cstdlib> // for rand()
 #include <cmath> // for fabs()
 #include <cstddef> // size_t
-#include <boost/math/special_functions/next.hpp>

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -246,9 +245,13 @@ inline bool A::operator==(const A &rhs) const
        return false; 
    if(v != rhs.v)
        return false; 
-    if(std::abs( boost::math::float_distance(w, rhs.w)) > 1)
+    if(w == 0 && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon())
        return false;
-    if(std::abs( boost::math::float_distance(x, rhs.x)) > 1)
+    if(std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon())
        return false;
    if(0 != y.compare(rhs.y))
        return false;
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_TEST_A_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -244,10 +244,14 @@ inline bool A::operator==(const A &rhs) const
    if(u != rhs.u)
        return false; 
    if(v != rhs.v)
+        return false; 
+    if(w == 0 && std::fabs(rhs.w) > std::numeric_limits<float>::epsilon())
        return false;
-    if(std::abs( boost::math::float_distance(w, rhs.w)) > 1)
+    if(std::fabs(rhs.w/w - 1.0) > std::numeric_limits<float>::epsilon())
        return false;
-    if(std::abs( boost::math::float_distance(x, rhs.x)) > 1)
+    if(x == 0 && std::fabs(rhs.x - x) > std::numeric_limits<float>::epsilon())
+        return false;
+    if(std::fabs(rhs.x/x - 1.0) > std::numeric_limits<float>::epsilon())
        return false;
    if(0 != y.compare(rhs.y))
        return false;
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_TEST_B_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -17,7 +17,6 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <cstdlib> // for rand()
-#include <boost/math/special_functions/next.hpp>

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
@@ -105,8 +104,8 @@ inline bool B::operator==(const B &rhs) const
        && t == rhs.t 
        && u == rhs.u 
        && v == rhs.v 
-        && std::abs( boost::math::float_distance(w, rhs.w)) < 2
-        && std::abs( boost::math::float_distance(x, rhs.x)) < 2
+        && std::fabs(w - rhs.w) <= std::numeric_limits<float>::round_error()
+        && std::fabs(x - rhs.x) <= std::numeric_limits<float>::round_error()
    ;
 }

@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_TEST_B_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -104,8 +104,8 @@ inline bool B::operator==(const B &rhs) const
        && t == rhs.t 
        && u == rhs.u 
        && v == rhs.v 
-        && std::abs( boost::math::float_distance(w, rhs.w)) < 2
-        && std::abs( boost::math::float_distance(x, rhs.x)) < 2
+        && std::fabs(w - rhs.w) <= std::numeric_limits<float>::round_error()
+        && std::fabs(x - rhs.x) <= std::numeric_limits<float>::round_error()
    ;
 }

@@ -11,6 +11,7 @@

 #include <boost/static_assert.hpp>
 #include <boost/type_traits/is_array.hpp>
+#include <boost/serialization/pfto.hpp>

 #define BOOST_ARCHIVE_SOURCE
 #include <boost/archive/binary_oarchive_impl.hpp>
@@ -60,26 +61,26 @@ public:
    // binary_oarchive_impl<derived_t>::load_override;
    // so we use the sure-fire method below.  This failed to work as well
    template<class T>
-    void save_override(T & t){
-        base_t::save_override(t);
+    void save_override(T & t, BOOST_PFTO int){
+        base_t::save_override(t, 0);
        // verify that this program is in fact working by making sure
        // that arrays are getting passed here
        BOOST_STATIC_ASSERT(! (boost::is_array<T>::value) );
    }
    template<int N>
-    void save_override(const int (& t)[N]){
+    void save_override(const int (& t)[N] , int){
        save_binary(t, sizeof(t));
    }
    template<int N>
-    void save_override(const unsigned int (& t)[N]){
+    void save_override(const unsigned int (& t)[N], int){
        save_binary(t, sizeof(t));
    }
    template<int N>
-    void save_override(const long (& t)[N]){
+    void save_override(const long (& t)[N], int){
        save_binary(t, sizeof(t));
    }
    template<int N>
-    void save_override(const unsigned long (& t)[N]){
+    void save_override(const unsigned long (& t)[N], int){
        save_binary(t, sizeof(t));
    }
 public:
@@ -128,24 +129,24 @@ public:
    // binary_oarchive_impl<derived_t>::load_override;
    // so we use the sure-fire method below.  This failed to work as well
    template<class T>
-    void load_override(T & t){
-        base_t::load_override(t);
+    void load_override(T & t, BOOST_PFTO int){
+        base_t::load_override(t, 0);
        BOOST_STATIC_ASSERT(! (boost::is_array<T>::value) );
    }
    template<int N>
-    void load_override(int (& t)[N]){
+    void load_override(int (& t)[N], int){
        load_binary(t, sizeof(t));
    }
    template<int N>
-    void load_override(unsigned int (& t)[N]){
+    void load_override(unsigned int (& t)[N], int){
        load_binary(t, sizeof(t));
    }
    template<int N>
-    void load_override(long (& t)[N]){
+    void load_override(long (& t)[N], int){
        load_binary(t, sizeof(t));
    }
    template<int N>
-    void load_override(unsigned long (& t)[N]){
+    void load_override(unsigned long (& t)[N], int){
        load_binary(t, sizeof(t));
    }
 public:
@@ -13,7 +13,8 @@
 #include "demo_gps.hpp"
 #include "log_archive.hpp"

-int main(int argc, char *argv[]){
+int main(int argc, char *argv[])
+{   
    // make the schedule
    bus_schedule schedule;

@@ -64,7 +65,7 @@ int main(int argc, char *argv[]){

    // display the complete schedule
    log_archive oa(std::cout);
-    oa << BOOST_SERIALIZATION_NVP(schedule);
+    //oa << BOOST_SERIALIZATION_NVP(schedule);
    oa << schedule;

    delete bs0;
@@ -73,4 +74,3 @@ int main(int argc, char *argv[]){
    delete bs3;
    return 0;
 }
-
@@ -2,7 +2,7 @@
 #define LOG_ARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -18,14 +18,6 @@

 #include <boost/archive/xml_oarchive.hpp>

-namespace boost {
-    namespace archive {
-        namespace detail {
-            template<class Archive> class interface_oarchive;
-        } // namespace detail
-    } // namespace archive
-} // boost
-
 /////////////////////////////////////////////////////////////////////////
 // log data to an output stream.  This illustrates a simpler implemenation
 // of text output which is useful for getting a formatted display of
@@ -44,31 +36,34 @@ class log_archive :
    // Override functions defined in basic_xml_oarchive

    // Anything not an attribute and not a name-value pair is an
-    // error and should be trapped here.
+    // error and should be trapped here.  Note the usage of
+    // function argument matching (BOOST_PFTO) to permit usage
+    // with compilers which fail to properly support 
+    // function template ordering
    template<class T>
-    void save_override(T & t){
+    void save_override(T & t, BOOST_PFTO int){
        // make it a name-value pair and pass it on.
        // this permits this to be used even with data types which
        // are not wrapped with the name
-        base::save_override(boost::serialization::make_nvp(NULL, t));
+        base::save_override(boost::serialization::make_nvp(NULL, t), 0);
    }
    template<class T>
-    void save_override(const boost::serialization::nvp< T > & t){
+    void save_override(const boost::serialization::nvp< T > & t, int){
        // this is here to remove the "const" requirement.  Since
        // this class is to be used only for output, it's not required.
-        base::save_override(t);
+        base::save_override(t, 0);
    }
    // specific overrides for attributes - not name value pairs so we
    // want to trap them before the above "fall through"
    // since we don't want to see these in the output - make them no-ops.
-    void save_override(const boost::archive::object_id_type & t){}
-    void save_override(const boost::archive::object_reference_type & t){}
-    void save_override(const boost::archive::version_type & t){}
-    void save_override(const boost::archive::class_id_type & t){}
-    void save_override(const boost::archive::class_id_optional_type & t){}
-    void save_override(const boost::archive::class_id_reference_type & t){}
-    void save_override(const boost::archive::class_name_type & t){}
-    void save_override(const boost::archive::tracking_type & t){}
+    void save_override(const boost::archive::object_id_type & t, int){}
+    void save_override(const boost::archive::object_reference_type & t, int){}
+    void save_override(const boost::archive::version_type & t, int){}
+    void save_override(const boost::archive::class_id_type & t, int){}
+    void save_override(const boost::archive::class_id_optional_type & t, int){}
+    void save_override(const boost::archive::class_id_reference_type & t, int){}
+    void save_override(const boost::archive::class_name_type & t, int){}
+    void save_override(const boost::archive::tracking_type & t, int){}
 public:
    log_archive(std::ostream & os, unsigned int flags = 0) :
        boost::archive::xml_oarchive_impl<log_archive>(
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_POLYMORPHIC_PORTABLE_BINARY_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -7,12 +7,13 @@
 // http://www.boost.org/LICENSE_1_0.txt)

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

 #include <boost/config.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/serialization/pfto.hpp>
 #include <boost/static_assert.hpp>

 #include <climits>
@@ -47,7 +47,7 @@ portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
    #else
        if(m_flags & endian_big)
    #endif
-    reverse_bytes(size, cptr);
+            reverse_bytes(size, cptr);
    
    if(negative)
        l = -l;
@@ -55,11 +55,11 @@ portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){

 void
 portable_binary_iarchive::load_override(
-    boost::archive::class_name_type & t
+    boost::archive::class_name_type & t, int
 ){
    std::string cn;
    cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
-    load_override(cn);
+    load_override(cn, 0);
    if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
        boost::serialization::throw_exception(
            boost::archive::archive_exception(
@@ -2,7 +2,7 @@
 #define PORTABLE_BINARY_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -27,6 +27,7 @@
 #include <boost/archive/archive_exception.hpp>
 #include <boost/archive/basic_binary_iprimitive.hpp>
 #include <boost/archive/detail/common_iarchive.hpp>
+#include <boost/archive/shared_ptr_helper.hpp>
 #include <boost/archive/detail/register_archive.hpp>

 #include "portable_binary_archive.hpp"
@@ -35,20 +36,19 @@
 // exception to be thrown if integer read from archive doesn't fit
 // variable being loaded
 class portable_binary_iarchive_exception : 
-    public boost::archive::archive_exception
+    public virtual boost::archive::archive_exception
 {
 public:
-    enum exception_code {
-        incompatible_integer_size
-    } m_exception_code ;
+    typedef enum {
+        incompatible_integer_size 
+    } exception_code;
    portable_binary_iarchive_exception(exception_code c = incompatible_integer_size ) :
-        boost::archive::archive_exception(boost::archive::archive_exception::other_exception),
-        m_exception_code(c)
+        boost::archive::archive_exception(boost::archive::archive_exception::other_exception)
    {}
    virtual const char *what( ) const throw( )
    {
        const char *msg = "programmer error";
-        switch(m_exception_code){
+        switch(code){
        case incompatible_integer_size:
            msg = "integer cannot be represented";
            break;
@@ -74,6 +74,8 @@ class portable_binary_iarchive :
    public boost::archive::detail::common_iarchive<
        portable_binary_iarchive
    >
+    ,
+    public boost::archive::detail::shared_ptr_helper
    {
    typedef boost::archive::basic_binary_iprimitive<
        portable_binary_iarchive,
@@ -148,15 +150,21 @@ protected:
    void load(unsigned char & t){
        this->primitive_base_t::load(t);
    }
+    // intermediate level to support override of operators
+    // fot templates in the absence of partial function 
+    // template ordering
    typedef boost::archive::detail::common_iarchive<portable_binary_iarchive> 
        detail_common_iarchive;
    template<class T>
-    void load_override(T & t){
-        this->detail_common_iarchive::load_override(t);
+    void load_override(T & t, BOOST_PFTO int){
+        this->detail_common_iarchive::load_override(t, 0);
    }
-    void load_override(boost::archive::class_name_type & t);
+    void load_override(boost::archive::class_name_type & t, int);
    // binary files don't include the optional information 
-    void load_override(boost::archive::class_id_optional_type &){}
+    void load_override(
+        boost::archive::class_id_optional_type & /* t */, 
+        int
+    ){}

    void init(unsigned int flags);
 public:
@@ -2,7 +2,7 @@
 #define PORTABLE_BINARY_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -34,7 +34,7 @@
 // exception to be thrown if integer read from archive doesn't fit
 // variable being loaded
 class portable_binary_oarchive_exception : 
-    public boost::archive::archive_exception
+    public virtual boost::archive::archive_exception
 {
 public:
    typedef enum {
@@ -131,17 +131,18 @@ protected:
    typedef boost::archive::detail::common_oarchive<portable_binary_oarchive> 
        detail_common_oarchive;
    template<class T>
-    void save_override(T & t){
-        this->detail_common_oarchive::save_override(t);
+    void save_override(T & t, BOOST_PFTO int){
+        this->detail_common_oarchive::save_override(t, 0);
    }
    // explicitly convert to char * to avoid compile ambiguities
-    void save_override(const boost::archive::class_name_type & t){
+    void save_override(const boost::archive::class_name_type & t, int){
        const std::string s(t);
        * this << s;
    }
    // binary files don't include the optional information 
    void save_override(
-        const boost::archive::class_id_optional_type & /* t */
+        const boost::archive::class_id_optional_type & /* t */, 
+        int
    ){}

    void init(unsigned int flags);
@@ -2,7 +2,7 @@
 #define BOOST_SIMPLE_LOG_ARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -0,0 +1,55 @@
+#ifndef BOOST_ARCHIVE_ADD_FACET_HPP
+#define BOOST_ARCHIVE_ADD_FACET_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// add_facet.hpp
+
+// (C) Copyright 2003 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+#include <locale>
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+
+// does STLport uses native STL for locales?
+#if (defined(__SGI_STL_PORT)&& defined(_STLP_NO_OWN_IOSTREAMS))
+// and this native STL lib is old Dinkumware (has not defined _CPPLIB_VER)
+#  if (defined(_YVALS) && !defined(__IBMCPP__)) || !defined(_CPPLIB_VER)
+#    define BOOST_ARCHIVE_OLD_DINKUMWARE_BENEATH_STLPORT
+#  endif
+#endif
+
+namespace boost { 
+namespace archive {
+
+template<class Facet>
+inline std::locale * 
+add_facet(const std::locale &l, Facet * f){
+    return
+        #if defined BOOST_ARCHIVE_OLD_DINKUMWARE_BENEATH_STLPORT 
+            // std namespace used for native locale
+            new std::locale(std::_Addfac(l, f));
+        #elif BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1) // old Dinkumwar
+            // std namespace used for native locale
+            new std::locale(std::_Addfac(l, f));
+        #else
+            // standard compatible
+            new std::locale(l, f);
+        #endif
+}
+
+} // namespace archive
+} // namespace boost
+
+#undef BOOST_ARCHIVE_OLD_DINKUMWARE_BENEATH_STLPORT
+
+#endif // BOOST_ARCHIVE_ADD_FACET_HPP
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_ARCHIVE_EXCEPTION_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -21,6 +21,7 @@
 #include <string>

 #include <boost/config.hpp> 
+#include <boost/preprocessor/empty.hpp>
 #include <boost/archive/detail/decl.hpp>

 // note: the only reason this is in here is that windows header
@@ -39,21 +40,14 @@ namespace archive {
 //////////////////////////////////////////////////////////////////////
 // exceptions thrown by archives
 //
-class BOOST_SYMBOL_VISIBLE archive_exception : 
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) archive_exception : 
    public virtual std::exception
 {
-private:
-    char m_buffer[128];
-protected:
-    BOOST_ARCHIVE_DECL unsigned int
-    append(unsigned int l, const char * a);
-    BOOST_ARCHIVE_DECL
-    archive_exception() BOOST_NOEXCEPT;
 public:
    typedef enum {
        no_exception,       // initialized without code
        other_exception,    // any excepton not listed below
-        unregistered_class, // attempt to serialize a pointer of
+        unregistered_class, // attempt to serialize a pointer of an
                            // an unregistered class
        invalid_signature,  // first line of archive does not contain
                            // expected string
@@ -61,8 +55,8 @@ public:
                            // subsequent to this one
        pointer_conflict,   // an attempt has been made to directly
                            // serialize an object which has
-                            // already been serialized through a pointer.  
-                            // Were this permitted, the archive load would result 
+                            // already been serialzed through a pointer.  
+                            // Were this permited, the archive load would result 
                            // in the creation of an extra copy of the obect.
        incompatible_native_format, // attempt to read native binary format
                            // on incompatible platform
@@ -74,22 +68,25 @@ public:
        unregistered_cast,   // base - derived relationship not registered with 
                            // void_cast_register
        unsupported_class_version, // type saved with a version # greater than the 
-                            // one used by the program.  This indicates that the program
+                            // one used by the program.  This indicates that the proggram
                            // needs to be rebuilt.
        multiple_code_instantiation, // code for implementing serialization for some
                            // type has been instantiated in more than one module.
        output_stream_error // error on input stream
    } exception_code;
+protected:
+    std::string m_msg;
+public:
    exception_code code;
-
-    BOOST_ARCHIVE_DECL archive_exception(
+    archive_exception(
        exception_code c, 
        const char * e1 = NULL,
        const char * e2 = NULL
-    ) BOOST_NOEXCEPT;
-    BOOST_ARCHIVE_DECL archive_exception(archive_exception const &) BOOST_NOEXCEPT ;
-    virtual BOOST_ARCHIVE_DECL ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW ;
-    virtual BOOST_ARCHIVE_DECL const char * what() const BOOST_NOEXCEPT_OR_NOTHROW ;
+    );
+    ~archive_exception() throw ();
+    virtual const char *what( ) const throw();
+protected:
+    archive_exception();
 };

 }// namespace archive
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_ARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -15,7 +15,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)

 //  See http://www.boost.org for updates, documentation, and revision history.
-#include <cstring> // count
+
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/cstdint.hpp> // size_t
@@ -69,7 +69,7 @@ public:
    }   
 };

-BOOST_ARCHIVE_DECL library_version_type
+BOOST_ARCHIVE_DECL(library_version_type)
 BOOST_ARCHIVE_VERSION();

 class version_type {
@@ -150,8 +150,7 @@ private:
    base_type t;
 public:
    object_id_type(): t(0) {};
-    // note: presumes that size_t >= unsigned int.
-    explicit object_id_type(const std::size_t & t_) : t(t_){
+    explicit object_id_type(const unsigned int & t_) : t(t_){
        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
    }
    object_id_type(const object_id_type & t_) : 
@@ -221,9 +220,6 @@ struct class_name_type :
    operator char * () {
        return t;
    }
-    std::size_t size() const {
-        return std::strlen(t);
-    }
    explicit class_name_type(const char *key_) 
    : t(const_cast<char *>(key_)){}
    explicit class_name_type(char *key_) 
@@ -242,7 +238,7 @@ enum archive_flags {
    flags_last = 8
 };

-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_SIGNATURE();

 /* NOTE : Warning  : Warning : Warning : Warning : Warning
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_BINARY_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -25,6 +25,7 @@

 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/serialization/pfto.hpp>

 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/common_iarchive.hpp>
@@ -43,27 +44,21 @@
 namespace boost { 
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_iarchive;
-} // namespace detail
-
 /////////////////////////////////////////////////////////////////////////
 // class basic_binary_iarchive - read serialized objects from a input binary stream
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_binary_iarchive : 
+class basic_binary_iarchive : 
    public detail::common_iarchive<Archive>
 {
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_iarchive<Archive>;
-    #else
-        friend class detail::interface_iarchive<Archive>;
-    #endif
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_iarchive<Archive>;
+#else
+    friend class detail::interface_iarchive<Archive>;
 #endif
    // intermediate level to support override of operators
    // fot templates in the absence of partial function 
@@ -71,8 +66,8 @@ protected:
    // note extra nonsense to sneak it pass the borland compiers
    typedef detail::common_iarchive<Archive> detail_common_iarchive;
    template<class T>
-    void load_override(T & t){
-      this->detail_common_iarchive::load_override(t);
+    void load_override(T & t, BOOST_PFTO int version){
+      this->detail_common_iarchive::load_override(t, static_cast<int>(version));
    }

    // include these to trap a change in binary format which
@@ -85,7 +80,7 @@ protected:
    BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t));

    // binary files don't include the optional information 
-    void load_override(class_id_optional_type & /* t */){}
+    void load_override(class_id_optional_type & /* t */, int){}

    void load_override(tracking_type & t, int /*version*/){
        library_version_type lvt = this->get_library_version();
@@ -100,10 +95,10 @@ protected:
            t = boost::archive::tracking_type(x);
        }
    }
-    void load_override(class_id_type & t){
+    void load_override(class_id_type & t, int version){
        library_version_type lvt = this->get_library_version();
        if(boost::archive::library_version_type(7) < lvt){
-            this->detail_common_iarchive::load_override(t);
+            this->detail_common_iarchive::load_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -117,14 +112,37 @@ protected:
            t = boost::archive::class_id_type(x);
        }
    }
-    void load_override(class_id_reference_type & t){
-        load_override(static_cast<class_id_type &>(t));
+    void load_override(class_id_reference_type & t, int version){
+        load_override(static_cast<class_id_type &>(t), version);
    }
-
-    void load_override(version_type & t){
+#if 0
+    void load_override(class_id_reference_type & t, int version){
        library_version_type lvt = this->get_library_version();
        if(boost::archive::library_version_type(7) < lvt){
-            this->detail_common_iarchive::load_override(t);
+            this->detail_common_iarchive::load_override(t, version);
+        }
+        else
+        if(boost::archive::library_version_type(6) < lvt){
+            int_least16_t x=0;
+            * this->This() >> x;
+            t = boost::archive::class_id_reference_type(
+                boost::archive::class_id_type(x)
+            );
+        }
+        else{
+            int x=0;
+            * this->This() >> x;
+            t = boost::archive::class_id_reference_type(
+                boost::archive::class_id_type(x)
+            );
+        }
+    }
+#endif
+
+    void load_override(version_type & t, int version){
+        library_version_type lvt = this->get_library_version();
+        if(boost::archive::library_version_type(7) < lvt){
+            this->detail_common_iarchive::load_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -152,11 +170,11 @@ protected:
        }
    }

-    void load_override(boost::serialization::item_version_type & t){
+    void load_override(boost::serialization::item_version_type & t, int version){
        library_version_type lvt = this->get_library_version();
 //        if(boost::archive::library_version_type(7) < lvt){
        if(boost::archive::library_version_type(6) < lvt){
-            this->detail_common_iarchive::load_override(t);
+            this->detail_common_iarchive::load_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -171,9 +189,9 @@ protected:
        }
    }

-    void load_override(serialization::collection_size_type & t){
+    void load_override(serialization::collection_size_type & t, int version){
        if(boost::archive::library_version_type(5) < this->get_library_version()){
-            this->detail_common_iarchive::load_override(t);
+            this->detail_common_iarchive::load_override(t, version);
        }
        else{
            unsigned int x=0;
@@ -182,9 +200,9 @@ protected:
        } 
    }

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(class_name_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(class_name_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();
   
    basic_binary_iarchive(unsigned int flags) :
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_IPRIMITIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -44,17 +44,16 @@ namespace std{
 #endif

 #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/mpl/placeholders.hpp>
+#include <boost/archive/basic_streambuf_locale_saver.hpp>
+#include <boost/archive/archive_exception.hpp>
+#include <boost/mpl/placeholders.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
 #include <boost/serialization/array.hpp>
-
-#include <boost/archive/basic_streambuf_locale_saver.hpp>
-#include <boost/archive/codecvt_null.hpp>
-#include <boost/archive/archive_exception.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

@@ -64,7 +63,8 @@ namespace archive {
 /////////////////////////////////////////////////////////////////////////////
 // class binary_iarchive - read serialized objects from a input binary stream
 template<class Archive, class Elem, class Tr>
-class BOOST_SYMBOL_VISIBLE basic_binary_iprimitive {
+class basic_binary_iprimitive
+{
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
    friend class load_access;
 protected:
@@ -78,16 +78,8 @@ public:
    }

    #ifndef BOOST_NO_STD_LOCALE
-    // note order! - if you change this, libstd++ will fail!
-    // a) create new locale with new codecvt facet
-    // b) save current locale
-    // c) change locale to new one
-    // d) use stream buffer
-    // e) change locale back to original
-    // f) destroy new codecvt facet
-    boost::archive::codecvt_null<Elem> codecvt_null_facet;
+    boost::scoped_ptr<std::locale> archive_locale;
    basic_streambuf_locale_saver<Elem, Tr> locale_saver;
-    std::locale archive_locale;
    #endif

    // main template for serilization of primitive types
@@ -106,25 +98,25 @@ public:
        BOOST_ASSERT(0 == i || 1 == i);
        (void)i; // warning suppression for release builds.
    }
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load(std::string &s);
    #ifndef BOOST_NO_STD_WSTRING
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load(std::wstring &ws);
    #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load(char * t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load(wchar_t * t);

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    basic_binary_iprimitive(
        std::basic_streambuf<Elem, Tr> & sb, 
        bool no_codecvt
    );
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    ~basic_binary_iprimitive();
 public:
    // we provide an optimized load for all fundamental types
@@ -134,7 +126,7 @@ public:
        template <class T>  
        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)  
            struct apply {  
-                typedef typename boost::serialization::is_bitwise_serializable< T >::type type;  
+                typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable< T >::type type;  
            };
        #else
            struct apply : public boost::serialization::is_bitwise_serializable< T > {};  
@@ -143,7 +135,7 @@ public:

    // the optimized load_array dispatches to load_binary 
    template <class ValueType>
-    void load_array(serialization::array_wrapper<ValueType>& a, unsigned int)
+    void load_array(serialization::array<ValueType>& a, unsigned int)
    {
      load_binary(a.address(),a.count()*sizeof(ValueType));
    }
@@ -186,7 +178,7 @@ basic_binary_iprimitive<Archive, Elem, Tr>::load_binary(
            boost::serialization::throw_exception(
                archive_exception(archive_exception::input_stream_error)
            );
-        std::memcpy(static_cast<char*>(address) + (count - s), &t, static_cast<std::size_t>(s));
+        std::memcpy(static_cast<char*>(address) + (count - s), &t, s);
    }
 }

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_BINARY_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -26,6 +26,7 @@
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/serialization/pfto.hpp>

 #include <boost/integer.hpp>
 #include <boost/integer_traits.hpp>
@@ -45,10 +46,6 @@
 namespace boost {
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_oarchive;
-} // namespace detail
-
 //////////////////////////////////////////////////////////////////////
 // class basic_binary_oarchive - write serialized objects to a binary output stream
 // note: this archive has no pretensions to portability.  Archive format
@@ -58,26 +55,24 @@ namespace detail {
 // does have the virtue of buiding the smalles archive in the minimum amount
 // of time.  So under some circumstances it may be he right choice.
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_binary_oarchive : 
-    public detail::common_oarchive<Archive>
+class basic_binary_oarchive : 
+    public archive::detail::common_oarchive<Archive>
 {
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_oarchive<Archive>;
-    #else
-        friend class detail::interface_oarchive<Archive>;
-    #endif
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_oarchive<Archive>;
+#else
+    friend class detail::interface_oarchive<Archive>;
 #endif
    // any datatype not specifed below will be handled by base class
    typedef detail::common_oarchive<Archive> detail_common_oarchive;
    template<class T>
-    void save_override(const T & t){
-      this->detail_common_oarchive::save_override(t);
+    void save_override(const T & t, BOOST_PFTO int version){
+      this->detail_common_oarchive::save_override(t, static_cast<int>(version));
    }

    // include these to trap a change in binary format which
@@ -91,14 +86,14 @@ protected:
    BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t));

    // binary files don't include the optional information 
-    void save_override(const class_id_optional_type & /* t */){}
+    void save_override(const class_id_optional_type & /* t */, int){}

    // enable this if we decide to support generation of previous versions
    #if 0
-    void save_override(const boost::archive::version_type & t){
+    void save_override(const boost::archive::version_type & t, int version){
        library_version_type lvt = this->get_library_version();
        if(boost::archive::library_version_type(7) < lvt){
-            this->detail_common_oarchive::save_override(t);
+            this->detail_common_oarchive::save_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -110,10 +105,10 @@ protected:
            * this->This() << x;
        }
    }
-    void save_override(const boost::serialization::item_version_type & t){
+    void save_override(const boost::serialization::item_version_type & t, int version){
        library_version_type lvt = this->get_library_version();
        if(boost::archive::library_version_type(7) < lvt){
-            this->detail_common_oarchive::save_override(t);
+            this->detail_common_oarchive::save_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -126,10 +121,10 @@ protected:
        }
    }

-    void save_override(class_id_type & t){
+    void save_override(class_id_type & t, int version){
        library_version_type lvt = this->get_library_version();
        if(boost::archive::library_version_type(7) < lvt){
-            this->detail_common_oarchive::save_override(t);
+            this->detail_common_oarchive::save_override(t, version);
        }
        else
        if(boost::archive::library_version_type(6) < lvt){
@@ -141,20 +136,20 @@ protected:
            * this->This() << x;
        }
    }
-    void save_override(class_id_reference_type & t){
-        save_override(static_cast<class_id_type &>(t));
+    void save_override(class_id_reference_type & t, int version){
+        save_override(static_cast<class_id_type &>(t), version);
    }

    #endif

    // explicitly convert to char * to avoid compile ambiguities
-    void save_override(const class_name_type & t){
+    void save_override(const class_name_type & t, int){
        const std::string s(t);
        * this->This() << s;
    }

    #if 0
-    void save_override(const serialization::collection_size_type & t){
+    void save_override(const serialization::collection_size_type & t, int){
        if (get_library_version() < boost::archive::library_version_type(6)){
            unsigned int x=0;
            * this->This() >> x;
@@ -165,7 +160,7 @@ protected:
        }
    }
    #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();

    basic_binary_oarchive(unsigned int flags) :
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_BINARY_OPRIMITIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -43,13 +43,11 @@ namespace std{
 #include <boost/scoped_ptr.hpp>
 #include <boost/serialization/throw_exception.hpp>

-//#include <boost/mpl/placeholders.hpp>
-#include <boost/serialization/is_bitwise_serializable.hpp>
-#include <boost/serialization/array.hpp>
-
 #include <boost/archive/basic_streambuf_locale_saver.hpp>
-#include <boost/archive/codecvt_null.hpp>
 #include <boost/archive/archive_exception.hpp>
+#include <boost/serialization/is_bitwise_serializable.hpp>
+#include <boost/mpl/placeholders.hpp>
+#include <boost/serialization/array.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

@@ -60,7 +58,8 @@ namespace archive {
 // class basic_binary_oprimitive - binary output of prmitives

 template<class Archive, class Elem, class Tr>
-class BOOST_SYMBOL_VISIBLE basic_binary_oprimitive {
+class basic_binary_oprimitive
+{
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
    friend class save_access;
 protected:
@@ -73,16 +72,8 @@ public:
        return static_cast<Archive *>(this);
    }
    #ifndef BOOST_NO_STD_LOCALE
-    // note order! - if you change this, libstd++ will fail!
-    // a) create new locale with new codecvt facet
-    // b) save current locale
-    // c) change locale to new one
-    // d) use stream buffer
-    // e) change locale back to original
-    // f) destroy new codecvt facet
-    boost::archive::codecvt_null<Elem> codecvt_null_facet;
+    boost::scoped_ptr<std::locale> archive_locale;
    basic_streambuf_locale_saver<Elem, Tr> locale_saver;
-    std::locale archive_locale;
    #endif
    // default saving of primitives.
    template<class T>
@@ -100,26 +91,26 @@ public:
        BOOST_ASSERT(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
        save_binary(& t, sizeof(t));
    }
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save(const std::string &s);
    #ifndef BOOST_NO_STD_WSTRING
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save(const std::wstring &ws);
    #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save(const char * t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save(const wchar_t * t);

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();
    
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    basic_binary_oprimitive(
        std::basic_streambuf<Elem, Tr> & sb, 
        bool no_codecvt
    );
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    ~basic_binary_oprimitive();
 public:

@@ -131,16 +122,17 @@ public:
        template <class T>  
        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)  
            struct apply {  
-                typedef typename boost::serialization::is_bitwise_serializable< T >::type type;  
+                typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable< T >::type type;  
            };
        #else
            struct apply : public boost::serialization::is_bitwise_serializable< T > {};  
        #endif
    };
+    

    // the optimized save_array dispatches to save_binary 
    template <class ValueType>
-    void save_array(boost::serialization::array_wrapper<ValueType> const& a, unsigned int)
+    void save_array(boost::serialization::array<ValueType> const& a, unsigned int)
    {
      save_binary(a.address(),a.count()*sizeof(ValueType));
    }
@@ -154,7 +146,9 @@ basic_binary_oprimitive<Archive, Elem, Tr>::save_binary(
    const void *address, 
    std::size_t count
 ){
-    // BOOST_ASSERT(count <= std::size_t(boost::integer_traits<std::streamsize>::const_max));
+    //BOOST_ASSERT(
+    //    static_cast<std::size_t>((std::numeric_limits<std::streamsize>::max)()) >= count
+    //);
    // note: if the following assertions fail
    // a likely cause is that the output stream is set to "text"
    // mode where by cr characters recieve special treatment.
@@ -164,7 +158,9 @@ basic_binary_oprimitive<Archive, Elem, Tr>::save_binary(
    //        archive_exception(archive_exception::output_stream_error)
    //    );
    // figure number of elements to output - round up
-    count = ( count + sizeof(Elem) - 1) / sizeof(Elem);
+    count = ( count + sizeof(Elem) - 1) 
+        / sizeof(Elem);
+    BOOST_ASSERT(count <= std::size_t(boost::integer_traits<std::streamsize>::const_max));
    std::streamsize scount = m_sb.sputn(
        static_cast<const Elem *>(address), 
        static_cast<std::streamsize>(count)
@@ -174,7 +170,7 @@ basic_binary_oprimitive<Archive, Elem, Tr>::save_binary(
            archive_exception(archive_exception::output_stream_error)
        );
    //os.write(
-    //    static_cast<const typename OStream::char_type *>(address), 
+    //    static_cast<const BOOST_DEDUCED_TYPENAME OStream::char_type *>(address), 
    //    count
    //);
    //BOOST_ASSERT(os.good());
@@ -2,12 +2,12 @@
 #define BOOST_ARCHIVE_BASIC_STREAMBUF_LOCALE_SAVER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// basic_streambuf_locale_saver.hpp
+// basic_streambuf_local_saver.hpp

 // (C) Copyright 2005 Robert Ramey - http://www.rrsd.com

@@ -27,7 +27,6 @@
 #ifndef BOOST_NO_STD_LOCALE

 #include <locale>     // for std::locale
-#include <ios>
 #include <streambuf>  // for std::basic_streambuf

 #include <boost/config.hpp>
@@ -46,57 +45,23 @@ class basic_streambuf_locale_saver :
    private boost::noncopyable
 {
 public:
-    explicit basic_streambuf_locale_saver(std::basic_streambuf<Ch, Tr> &s) :
-        m_streambuf(s),
-        m_locale(s.getloc())
-    {}
-    ~basic_streambuf_locale_saver(){
-        m_streambuf.pubsync();
-        m_streambuf.pubimbue(m_locale);
-    }
+    typedef ::std::basic_streambuf<Ch, Tr> state_type;
+    typedef ::std::locale aspect_type;
+    explicit basic_streambuf_locale_saver( state_type &s )
+        : s_save_( s ), a_save_( s.getloc() )
+        {}
+    basic_streambuf_locale_saver( state_type &s, aspect_type const &a )
+        : s_save_( s ), a_save_( s.pubimbue(a) )
+        {}
+    ~basic_streambuf_locale_saver()
+        { this->restore(); }
+    void  restore()
+        { s_save_.pubimbue( a_save_ ); }
 private:
-    std::basic_streambuf<Ch, Tr> &       m_streambuf;
-    std::locale const  m_locale;
+    state_type &       s_save_;
+    aspect_type const  a_save_;
 };

-template < typename Ch, class Tr >
-class basic_istream_locale_saver :
-    private boost::noncopyable
-{
-public:
-    explicit basic_istream_locale_saver(std::basic_istream<Ch, Tr> &s) :
-        m_istream(s),
-        m_locale(s.getloc())
-    {}
-    ~basic_istream_locale_saver(){
-        // libstdc++ crashes without this
-        m_istream.sync();
-        m_istream.imbue(m_locale);
-    }
-private:
-    std::basic_istream<Ch, Tr> & m_istream;
-    std::locale const  m_locale;
-};
-
-template < typename Ch, class Tr >
-class basic_ostream_locale_saver :
-    private boost::noncopyable
-{
-public:
-    explicit basic_ostream_locale_saver(std::basic_ostream<Ch, Tr> &s) :
-        m_ostream(s),
-        m_locale(s.getloc())
-    {}
-    ~basic_ostream_locale_saver(){
-        m_ostream.flush();
-        m_ostream.imbue(m_locale);
-    }
-private:
-    std::basic_ostream<Ch, Tr> & m_ostream;
-    std::locale const  m_locale;
-};
-
-
 } // archive
 } // boost

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_TEXT_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -25,6 +25,7 @@
 // use two template parameters

 #include <boost/config.hpp>
+#include <boost/serialization/pfto.hpp>
 #include <boost/detail/workaround.hpp>

 #include <boost/archive/detail/common_iarchive.hpp>
@@ -39,43 +40,37 @@
 namespace boost {
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_iarchive;
-} // namespace detail
-
 /////////////////////////////////////////////////////////////////////////
 // class basic_text_iarchive - read serialized objects from a input text stream
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_text_iarchive : 
+class basic_text_iarchive : 
    public detail::common_iarchive<Archive>
 {
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_iarchive<Archive>;
-    #else
-        friend class detail::interface_iarchive<Archive>;
-    #endif
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_iarchive<Archive>;
+#else
+    friend class detail::interface_iarchive<Archive>;
 #endif
    // intermediate level to support override of operators
    // fot templates in the absence of partial function 
    // template ordering
    typedef detail::common_iarchive<Archive> detail_common_iarchive;
    template<class T>
-    void load_override(T & t){
-        this->detail_common_iarchive::load_override(t);
+    void load_override(T & t, BOOST_PFTO int){
+        this->detail_common_iarchive::load_override(t, 0);
    }
    // text file don't include the optional information 
-    void load_override(class_id_optional_type & /*t*/){}
+    void load_override(class_id_optional_type & /*t*/, int){}

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(class_name_type & t);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(class_name_type & t, int);

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init(void);

    basic_text_iarchive(unsigned int flags) : 
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_TEXT_IPRIMITIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -24,6 +24,7 @@
 // in such cases.   So we can't use basic_ostream<IStream::char_type> but rather
 // use two template parameters

+#include <boost/assert.hpp>
 #include <locale>
 #include <cstddef> // size_t

@@ -37,15 +38,17 @@ namespace std{
 } // namespace std
 #endif

-#include <boost/io/ios_state.hpp>
-#include <boost/static_assert.hpp>
-
 #include <boost/detail/workaround.hpp>
 #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
 #include <boost/archive/dinkumware.hpp>
 #endif
+
+#include <boost/limits.hpp>
+#include <boost/io/ios_state.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/static_assert.hpp>
+
 #include <boost/serialization/throw_exception.hpp>
-#include <boost/archive/codecvt_null.hpp>
 #include <boost/archive/archive_exception.hpp>
 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -61,33 +64,32 @@ namespace archive {
 #endif

 template<class IStream>
-class BOOST_SYMBOL_VISIBLE basic_text_iprimitive {
+class basic_text_iprimitive
+{
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 protected:
+#else
+public:
+#endif
    IStream &is;
    io::ios_flags_saver flags_saver;
    io::ios_precision_saver precision_saver;

    #ifndef BOOST_NO_STD_LOCALE
-    // note order! - if you change this, libstd++ will fail!
-    // a) create new locale with new codecvt facet
-    // b) save current locale
-    // c) change locale to new one
-    // d) use stream buffer
-    // e) change locale back to original
-    // f) destroy new codecvt facet
-    boost::archive::codecvt_null<typename IStream::char_type> codecvt_null_facet;
-    std::locale archive_locale;
-    basic_istream_locale_saver<
-        typename IStream::char_type,
-        typename IStream::traits_type
+    boost::scoped_ptr<std::locale> archive_locale;
+    basic_streambuf_locale_saver<
+        BOOST_DEDUCED_TYPENAME IStream::char_type, 
+        BOOST_DEDUCED_TYPENAME IStream::traits_type
    > locale_saver;
    #endif

    template<class T>
    void load(T & t)
    {
-        if(is >> t)
+        if(! is.fail()){
+            is >> t;
            return;
+        }
        boost::serialization::throw_exception(
            archive_exception(archive_exception::input_stream_error)
        );
@@ -121,12 +123,12 @@ protected:
        t = i;
    }
    #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    basic_text_iprimitive(IStream  &is, bool no_codecvt);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    ~basic_text_iprimitive();
 public:
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load_binary(void *address, std::size_t count);
 };

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_TEXT_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -24,8 +24,11 @@
 // in such cases.   So we can't use basic_ostream<OStream::char_type> but rather
 // use two template parameters

+#include <boost/assert.hpp>
 #include <boost/config.hpp>
+#include <boost/serialization/pfto.hpp>
 #include <boost/detail/workaround.hpp>
+
 #include <boost/archive/detail/common_oarchive.hpp>
 #include <boost/serialization/string.hpp>

@@ -39,36 +42,30 @@
 namespace boost {
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_oarchive;
-} // namespace detail
-
 /////////////////////////////////////////////////////////////////////////
 // class basic_text_oarchive 
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_text_oarchive : 
+class basic_text_oarchive : 
    public detail::common_oarchive<Archive>
 {
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_oarchive<Archive>;
-    #else
-        friend class detail::interface_oarchive<Archive>;
-    #endif
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+|| BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x560))
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_oarchive<Archive>;
+#else
+    friend class detail::interface_oarchive<Archive>;
 #endif
-
    enum {
        none,
        eol,
        space
    } delimiter;

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    newtoken();

    void newline(){
@@ -79,25 +76,25 @@ protected:
    // extra stuff to get it passed borland compilers
    typedef detail::common_oarchive<Archive> detail_common_oarchive;
    template<class T>
-    void save_override(T & t){
-        this->detail_common_oarchive::save_override(t);
+    void save_override(T & t, BOOST_PFTO int){
+        this->detail_common_oarchive::save_override(t, 0);
    }

    // start new objects on a new line
-    void save_override(const object_id_type & t){
+    void save_override(const object_id_type & t, int){
        this->This()->newline();
-        this->detail_common_oarchive::save_override(t);
+        this->detail_common_oarchive::save_override(t, 0);
    }

    // text file don't include the optional information 
-    void save_override(const class_id_optional_type & /* t */){}
+    void save_override(const class_id_optional_type & /* t */, int){}

-    void save_override(const class_name_type & t){
+    void save_override(const class_name_type & t, int){
        const std::string s(t);
        * this->This() << s;
    }

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();

    basic_text_oarchive(unsigned int flags) :
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_TEXT_OPRIMITIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -26,12 +26,12 @@

 #include <iomanip>
 #include <locale>
+#include <boost/config/no_tr1/cmath.hpp> // isnan
+#include <boost/assert.hpp>
 #include <cstddef> // size_t

 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/io/ios_state.hpp>
-
 #include <boost/detail/workaround.hpp>
 #if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
 #include <boost/archive/dinkumware.hpp>
@@ -46,46 +46,52 @@ namespace std{
 } // namespace std
 #endif

-#include <boost/type_traits/is_floating_point.hpp>
-#include <boost/mpl/bool.hpp>
 #include <boost/limits.hpp>
 #include <boost/integer.hpp>
 #include <boost/io/ios_state.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <boost/serialization/throw_exception.hpp>
-#include <boost/archive/basic_streambuf_locale_saver.hpp>
-#include <boost/archive/codecvt_null.hpp>
 #include <boost/archive/archive_exception.hpp>
+#include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

 namespace boost {
 namespace archive {

+class save_access;
+
 /////////////////////////////////////////////////////////////////////////
 // class basic_text_oprimitive - output of prmitives to stream
 template<class OStream>
-class BOOST_SYMBOL_VISIBLE basic_text_oprimitive
+class basic_text_oprimitive
 {
+#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 protected:
+#else
+public:
+#endif
    OStream &os;
    io::ios_flags_saver flags_saver;
    io::ios_precision_saver precision_saver;

    #ifndef BOOST_NO_STD_LOCALE
-    // note order! - if you change this, libstd++ will fail!
-    // a) create new locale with new codecvt facet
-    // b) save current locale
-    // c) change locale to new one
-    // d) use stream buffer
-    // e) change locale back to original
-    // f) destroy new codecvt facet
-    boost::archive::codecvt_null<typename OStream::char_type> codecvt_null_facet;
-    std::locale archive_locale;
-    basic_ostream_locale_saver<
-        typename OStream::char_type,
-        typename OStream::traits_type
+    boost::scoped_ptr<std::locale> archive_locale;
+    basic_streambuf_locale_saver<
+        BOOST_DEDUCED_TYPENAME OStream::char_type, 
+        BOOST_DEDUCED_TYPENAME OStream::traits_type
    > locale_saver;
    #endif

+    // default saving of primitives.
+    template<class T>
+    void save(const T &t){
+        if(os.fail())
+            boost::serialization::throw_exception(
+                archive_exception(archive_exception::output_stream_error)
+            );
+        os << t;
+    }
+
    /////////////////////////////////////////////////////////
    // fundamental types that need special treatment
    void save(const bool t){
@@ -117,75 +123,33 @@ protected:
        save(static_cast<int>(t));
    }
    #endif
-
-    /////////////////////////////////////////////////////////
-    // saving of any types not listed above
-
-    template<class T>
-    void save_impl(const T &t, boost::mpl::bool_<false> &){
-        if(os.fail())
-            boost::serialization::throw_exception(
-                archive_exception(archive_exception::output_stream_error)
-            );
-        os << t;
-    }
-
-    /////////////////////////////////////////////////////////
-    // floating point types need even more special treatment
-    // the following determines whether the type T is some sort
-    // of floating point type.  Note that we then assume that
-    // the stream << operator is defined on that type - if not
-    // we'll get a compile time error. This is meant to automatically
-    // support synthesized types which support floating point
-    // operations. Also it should handle compiler dependent types
-    // such long double.  Due to John Maddock.
-
-    template<class T>
-    struct is_float {
-        typedef typename mpl::bool_< 
-            boost::is_floating_point<T>::value 
-            || (std::numeric_limits<T>::is_specialized
-            && !std::numeric_limits<T>::is_integer
-            && !std::numeric_limits<T>::is_exact
-            && std::numeric_limits<T>::max_exponent) 
-        >::type type;
-    };
-
-    template<class T>
-    void save_impl(const T &t, boost::mpl::bool_<true> &){
+    void save(const float t)
+    {
        // must be a user mistake - can't serialize un-initialized data
        if(os.fail())
            boost::serialization::throw_exception(
                archive_exception(archive_exception::output_stream_error)
            );
-        // The formulae for the number of decimla digits required is given in
-        // http://www2.open-std.org/JTC1/SC22/WG21/docs/papers/2005/n1822.pdf
-        // which is derived from Kahan's paper:
-        // www.eecs.berkeley.edu/~wkahan/ieee754status/ieee754.ps
-        // const unsigned int digits = (std::numeric_limits<T>::digits * 3010) / 10000;
-        // note: I've commented out the above because I didn't get good results.  e.g.
-        // in one case I got a difference of 19 units.
-        #ifndef BOOST_NO_CXX11_NUMERIC_LIMITS
-            const unsigned int digits = std::numeric_limits<T>::max_digits10;
-        #else
-            const unsigned int digits = std::numeric_limits<T>::digits10 + 2;
-        #endif
-        os << std::setprecision(digits) << std::scientific << t;
+        os << std::setprecision(std::numeric_limits<float>::digits10 + 2);
+        os << t;
    }
-
-    template<class T>
-    void save(const T & t){
-        typename is_float<T>::type tf;
-        save_impl(t, tf);
+    void save(const double t)
+    {
+        // must be a user mistake - can't serialize un-initialized data
+        if(os.fail())
+            boost::serialization::throw_exception(
+                archive_exception(archive_exception::output_stream_error)
+            );
+        os << std::setprecision(std::numeric_limits<double>::digits10 + 2);
+        os << t;
    }
-
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
    basic_text_oprimitive(OStream & os, bool no_codecvt);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
    ~basic_text_oprimitive();
 public:
    // unformatted append of one character
-    void put(typename OStream::char_type c){
+    void put(BOOST_DEDUCED_TYPENAME OStream::char_type c){
        if(os.fail())
            boost::serialization::throw_exception(
                archive_exception(archive_exception::output_stream_error)
@@ -197,7 +161,7 @@ public:
        while('\0' != *s)
            os.put(*s++);
    }
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void) 
    save_binary(const void *address, std::size_t count);
 };

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_XML_TEXT_ARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -27,35 +27,35 @@ namespace archive {
 // constant strings used in xml i/o

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_OBJECT_ID();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_OBJECT_REFERENCE();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_CLASS_ID();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_CLASS_NAME();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_TRACKING();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_VERSION();

 extern 
-BOOST_ARCHIVE_DECL const char *
+BOOST_ARCHIVE_DECL(const char *)
 BOOST_ARCHIVE_XML_SIGNATURE();

 }// namespace archive
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_XML_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -17,12 +17,16 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <boost/config.hpp>
-#include <boost/mpl/assert.hpp>
+#include <boost/serialization/pfto.hpp>
+#include <boost/detail/workaround.hpp>

 #include <boost/archive/detail/common_iarchive.hpp>
+
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/string.hpp>

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

 #ifdef BOOST_MSVC
@@ -33,38 +37,38 @@
 namespace boost {
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_iarchive;
-} // namespace detail
-
 /////////////////////////////////////////////////////////////////////////
-// class basic_xml_iarchive - read serialized objects from a input text stream
+// class xml_iarchive - read serialized objects from a input text stream
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_xml_iarchive :
+class basic_xml_iarchive :
    public detail::common_iarchive<Archive>
 {
-    unsigned int depth;
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
 protected:
-    friend class detail::interface_iarchive<Archive>;
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_oarchive<Archive>;
+#else
+    friend class detail::interface_oarchive<Archive>;
 #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    unsigned int depth;
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load_start(const char *name);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    load_end(const char *name);

    // Anything not an attribute and not a name-value pair is an
    // should be trapped here.
    template<class T>
-    void load_override(T & t)
+    void load_override(T & t,  BOOST_PFTO int)
    {
        // If your program fails to compile here, its most likely due to
        // not specifying an nvp wrapper around the variable to
        // be serialized.
        BOOST_MPL_ASSERT((serialization::is_wrapper< T >));
-        this->detail_common_iarchive::load_override(t);
+        this->detail_common_iarchive::load_override(t, 0);
    }

    // Anything not an attribute - see below - should be a name value
@@ -72,10 +76,14 @@ protected:
    typedef detail::common_iarchive<Archive> detail_common_iarchive;
    template<class T>
    void load_override(
-        const boost::serialization::nvp< T > & t
+        #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+        const
+        #endif
+        boost::serialization::nvp< T > & t,
+        int
    ){
        this->This()->load_start(t.name());
-        this->detail_common_iarchive::load_override(t.value());
+        this->detail_common_iarchive::load_override(t.value(), 0);
        this->This()->load_end(t.name());
    }

@@ -87,24 +95,23 @@ protected:
    // an xml archive.  So we can skip it here.  Note: we MUST override
    // it otherwise it will be loaded as a normal primitive w/o tag and
    // leaving the archive in an undetermined state
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(class_id_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(class_id_optional_type & /* t */){}
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(object_id_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(version_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    load_override(tracking_type & t);
+    void load_override(class_id_optional_type & /* t */, int){}
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(object_id_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(version_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(class_id_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    load_override(tracking_type & t, int);
    // class_name_type can't be handled here as it depends upon the
    // char type used by the stream.  So require the derived implementation
    // handle this.
-    // void load_override(class_name_type & t);
+    // void load_override(class_name_type & t, int);

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
    basic_xml_iarchive(unsigned int flags);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
    ~basic_xml_iarchive();
 };

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_XML_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -17,12 +17,15 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <boost/config.hpp>
-#include <boost/mpl/assert.hpp>

 #include <boost/archive/detail/common_oarchive.hpp>
+
 #include <boost/serialization/nvp.hpp>
+#include <boost/serialization/tracking.hpp>
 #include <boost/serialization/string.hpp>

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

 #ifdef BOOST_MSVC
@@ -33,96 +36,100 @@
 namespace boost {
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_oarchive;
-} // namespace detail
-
 //////////////////////////////////////////////////////////////////////
 // class basic_xml_oarchive - write serialized objects to a xml output stream
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_xml_oarchive :
+class basic_xml_oarchive :
    public detail::common_oarchive<Archive>
 {
+protected:
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
+public:
+#elif defined(BOOST_MSVC)
+    // for some inexplicable reason insertion of "class" generates compile erro
+    // on msvc 7.1
+    friend detail::interface_oarchive<Archive>;
+    friend class save_access;
+#else
+    friend class detail::interface_oarchive<Archive>;
+    friend class save_access;
+#endif
    // special stuff for xml output
    unsigned int depth;
-    bool pending_preamble;
-#ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-public:
-#else
-protected:
-    friend class detail::interface_oarchive<Archive>;
-#endif
    bool indent_next;
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    bool pending_preamble;
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    indent();
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    init();
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    windup();
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    write_attribute(
        const char *attribute_name,
        int t,
        const char *conjunction = "=\""
    );
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    write_attribute(
        const char *attribute_name,
        const char *key
    );
    // helpers used below
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save_start(const char *name);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    save_end(const char *name);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
    end_preamble();

    // Anything not an attribute and not a name-value pair is an
    // error and should be trapped here.
    template<class T>
-    void save_override(T & t)
+    void save_override(T & t, BOOST_PFTO int)
    {
        // If your program fails to compile here, its most likely due to
        // not specifying an nvp wrapper around the variable to
        // be serialized.
        BOOST_MPL_ASSERT((serialization::is_wrapper< T >));
-        this->detail_common_oarchive::save_override(t);
+        this->detail_common_oarchive::save_override(t, 0);
    }

    // special treatment for name-value pairs.
    typedef detail::common_oarchive<Archive> detail_common_oarchive;
    template<class T>
    void save_override(
-        const ::boost::serialization::nvp< T > & t
+        #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+        const
+        #endif
+        ::boost::serialization::nvp< T > & t,
+        int
    ){
        this->This()->save_start(t.name());
-        this->detail_common_oarchive::save_override(t.const_value());
+        this->detail_common_oarchive::save_override(t.const_value(), 0);
        this->This()->save_end(t.name());
    }

    // specific overrides for attributes - not name value pairs so we
    // want to trap them before the above "fall through"
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const class_id_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const class_id_optional_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const class_id_reference_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const object_id_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const object_reference_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const version_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const class_name_type & t);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
-    save_override(const tracking_type & t);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const object_id_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const object_reference_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const version_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const class_id_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const class_id_optional_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const class_id_reference_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const class_name_type & t, int);
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
+    save_override(const tracking_type & t, int);

-    BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
    basic_xml_oarchive(unsigned int flags);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
    ~basic_xml_oarchive();
 };

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -25,18 +25,57 @@
 #  pragma warning(disable : 4511 4512)
 #endif

-namespace boost {
+namespace boost { 
+namespace archive {
+
+// do not derive from the classes below.  If you want to extend this functionality
+// via inhertance, derived from text_iarchive_impl instead.  This will
+// preserve correct static polymorphism.
+
+// same as binary_iarchive below - without the shared_ptr_helper
+class naked_binary_iarchive : 
+    public binary_iarchive_impl<
+        boost::archive::naked_binary_iarchive, 
+        std::istream::char_type, 
+        std::istream::traits_type
+    >
+{
+public:
+    naked_binary_iarchive(std::istream & is, unsigned int flags = 0) :
+        binary_iarchive_impl<
+            naked_binary_iarchive, std::istream::char_type, std::istream::traits_type
+        >(is, flags)
+    {}
+    naked_binary_iarchive(std::streambuf & bsb, unsigned int flags = 0) :
+        binary_iarchive_impl<
+            naked_binary_iarchive, std::istream::char_type, std::istream::traits_type
+        >(bsb, flags)
+    {}
+};
+
+} // namespace archive
+} // namespace boost
+
+// note special treatment of shared_ptr. This type needs a special
+// structure associated with every archive.  We created a "mix-in"
+// class to provide this functionality.  Since shared_ptr holds a
+// special esteem in the boost library - we included it here by default.
+#include <boost/archive/shared_ptr_helper.hpp>
+
+namespace boost { 
 namespace archive {

 // do not derive from this class.  If you want to extend this functionality
 // via inhertance, derived from binary_iarchive_impl instead.  This will
 // preserve correct static polymorphism.
-class BOOST_SYMBOL_VISIBLE binary_iarchive :
+class binary_iarchive : 
    public binary_iarchive_impl<
        boost::archive::binary_iarchive, 
        std::istream::char_type, 
        std::istream::traits_type
-    >{
+    >,
+    public detail::shared_ptr_helper
+{
 public:
    binary_iarchive(std::istream & is, unsigned int flags = 0) :
        binary_iarchive_impl<
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_IARCHIVE_IMPL_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -17,6 +17,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <istream>
+#include <boost/serialization/pfto.hpp>
 #include <boost/archive/basic_binary_iprimitive.hpp>
 #include <boost/archive/basic_binary_iarchive.hpp>

@@ -28,39 +29,29 @@
 namespace boost { 
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_iarchive;
-} // namespace detail
-
 template<class Archive, class Elem, class Tr>
-class BOOST_SYMBOL_VISIBLE binary_iarchive_impl : 
+class binary_iarchive_impl : 
    public basic_binary_iprimitive<Archive, Elem, Tr>,
    public basic_binary_iarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
+    friend class detail::interface_iarchive<Archive>;
+    friend class basic_binary_iarchive<Archive>;
+    friend class load_access;
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_iarchive<Archive>;
-        friend basic_binary_iarchive<Archive>;
-        friend load_access;
-    #else
-        friend class detail::interface_iarchive<Archive>;
-        friend class basic_binary_iarchive<Archive>;
-        friend class load_access;
-    #endif
 #endif
+    // note: the following should not needed - but one compiler (vc 7.1)
+    // fails to compile one test (test_shared_ptr) without it !!!
+    // make this protected so it can be called from a derived archive
    template<class T>
-    void load_override(T & t){
-        this->basic_binary_iarchive<Archive>::load_override(t);
+    void load_override(T & t, BOOST_PFTO int){
+        this->basic_binary_iarchive<Archive>::load_override(t, 0L);
    }
    void init(unsigned int flags){
-        if(0 != (flags & no_header)){
+        if(0 != (flags & no_header))
            return;
-        }
        #if ! defined(__MWERKS__)
            this->basic_binary_iarchive<Archive>::init();
            this->basic_binary_iprimitive<Archive, Elem, Tr>::init();
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -32,7 +32,7 @@ namespace archive {
 // do not derive from this class.  If you want to extend this functionality
 // via inhertance, derived from binary_oarchive_impl instead.  This will
 // preserve correct static polymorphism.
-class BOOST_SYMBOL_VISIBLE binary_oarchive : 
+class binary_oarchive : 
    public binary_oarchive_impl<
        binary_oarchive, std::ostream::char_type, std::ostream::traits_type
    >
@@ -50,6 +50,8 @@ public:
    {}
 };

+typedef binary_oarchive naked_binary_oarchive;
+
 } // namespace archive
 } // namespace boost

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_OARCHIVE_IMPL_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -18,6 +18,7 @@

 #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>

@@ -29,39 +30,29 @@
 namespace boost { 
 namespace archive {

-namespace detail {
-    template<class Archive> class interface_oarchive;
-} // namespace detail
-
 template<class Archive, class Elem, class Tr>
-class BOOST_SYMBOL_VISIBLE binary_oarchive_impl : 
+class binary_oarchive_impl : 
    public basic_binary_oprimitive<Archive, Elem, Tr>,
    public basic_binary_oarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 public:
 #else
+    friend class detail::interface_oarchive<Archive>;
+    friend class basic_binary_oarchive<Archive>;
+    friend class save_access;
 protected:
-    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
-        // on msvc 7.1
-        friend detail::interface_oarchive<Archive>;
-        friend basic_binary_oarchive<Archive>;
-        friend save_access;
-    #else
-        friend class detail::interface_oarchive<Archive>;
-        friend class basic_binary_oarchive<Archive>;
-        friend class save_access;
-    #endif
 #endif
+    // note: the following should not needed - but one compiler (vc 7.1)
+    // fails to compile one test (test_shared_ptr) without it !!!
+    // make this protected so it can be called from a derived archive
    template<class T>
-    void save_override(T & t){
-        this->basic_binary_oarchive<Archive>::save_override(t);
+    void save_override(T & t, BOOST_PFTO int){
+        this->basic_binary_oarchive<Archive>::save_override(t, 0L);
    }
    void init(unsigned int flags) {
-        if(0 != (flags & no_header)){
+        if(0 != (flags & no_header))
            return;
-        }
        #if ! defined(__MWERKS__)
            this->basic_binary_oarchive<Archive>::init();
            this->basic_binary_oprimitive<Archive, Elem, Tr>::init();
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_WIARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -28,6 +28,43 @@
 namespace boost { 
 namespace archive {

+// same as binary_wiarchive below - without the shared_ptr_helper
+class naked_binary_wiarchive : 
+    public binary_iarchive_impl<
+        boost::archive::naked_binary_wiarchive, 
+        std::wistream::char_type, 
+        std::wistream::traits_type
+    >
+{
+public:
+    naked_binary_wiarchive(std::wistream & is, unsigned int flags = 0) :
+        binary_iarchive_impl<
+            naked_binary_wiarchive, 
+            std::wistream::char_type, 
+            std::wistream::traits_type
+        >(is, flags)
+    {}
+    naked_binary_wiarchive(std::wstreambuf & bsb, unsigned int flags = 0) :
+        binary_iarchive_impl<
+            naked_binary_wiarchive, 
+            std::wistream::char_type, 
+            std::wistream::traits_type
+        >(bsb, flags)
+    {}
+};
+
+} // namespace archive
+} // namespace boost
+
+// note special treatment of shared_ptr. This type needs a special
+// structure associated with every archive.  We created a "mix-in"
+// class to provide this functionality.  Since shared_ptr holds a
+// special esteem in the boost library - we included it here by default.
+#include <boost/archive/shared_ptr_helper.hpp>
+
+namespace boost { 
+namespace archive {
+
 class binary_wiarchive : 
    public binary_iarchive_impl<
        binary_wiarchive, std::wistream::char_type, std::wistream::traits_type
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_WOARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -49,6 +49,8 @@ public:
    {}
 };

+typedef binary_woarchive naked_binary_woarchive;
+
 } // namespace archive
 } // namespace boost

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_CODECVT_NULL_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -56,13 +56,12 @@ public:
    explicit codecvt_null(std::size_t no_locale_manage = 0) :
        std::codecvt<char, char, std::mbstate_t>(no_locale_manage)
    {}
-    virtual ~codecvt_null(){};
 };

 template<>
-class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
+class codecvt_null<wchar_t> : public std::codecvt<wchar_t, char, std::mbstate_t>
 {
-    virtual BOOST_WARCHIVE_DECL std::codecvt_base::result
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
    do_out(
        std::mbstate_t & state,
        const wchar_t * first1,
@@ -72,7 +71,7 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
        char * last2,
        char * & next2
    ) const;
-    virtual BOOST_WARCHIVE_DECL std::codecvt_base::result
+    virtual BOOST_WARCHIVE_DECL(std::codecvt_base::result)
    do_in(
        std::mbstate_t & state,
        const char * first1,
@@ -88,11 +87,6 @@ class BOOST_SYMBOL_VISIBLE codecvt_null<wchar_t> : public std::codecvt<wchar_t,
    virtual int do_max_length( ) const throw( ){
        return do_encoding();
    }
-public:
-    explicit codecvt_null(std::size_t no_locale_manage = 0) :
-        std::codecvt<wchar_t, char, std::mbstate_t>(no_locale_manage)
-    {}
-    virtual ~codecvt_null(){};
 };

 } // namespace archive
@@ -14,3 +14,7 @@
 #  pragma warning(disable : 4251 4231 4660 4275)
 #endif

+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+
@@ -13,3 +13,7 @@
 #endif
 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas

+#if defined( __BORLANDC__ )
+#pragma nopushoptwarn
+#endif
+
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_SERIALIZER_MAP_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -36,11 +36,12 @@ namespace detail {
 class basic_serializer;

 template<class Archive>
-class BOOST_SYMBOL_VISIBLE archive_serializer_map {
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) 
+archive_serializer_map {
 public:
-    static BOOST_ARCHIVE_OR_WARCHIVE_DECL bool insert(const basic_serializer * bs);
-    static BOOST_ARCHIVE_OR_WARCHIVE_DECL void erase(const basic_serializer * bs);
-    static BOOST_ARCHIVE_OR_WARCHIVE_DECL const basic_serializer * find(
+    static bool insert(const basic_serializer * bs);
+    static void erase(const basic_serializer * bs);
+    static const basic_serializer * find(
        const boost::serialization::extended_type_info & type_
    );
 };
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_AUTO_LINK_WARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -0,0 +1,48 @@
+#ifndef BOOST_ARCHIVE_DETAIL_BASIC_ARCHIVE_IMPL_HPP
+#define BOOST_ARCHIVE_DETAIL_BASIC_ARCHIVE_IMPL_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// basic_archive_impl.hpp:
+
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . 
+// Use, modification and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org for updates, documentation, and revision history.
+
+// can't use this - much as I'd like to as borland doesn't support it
+// #include <boost/scoped_ptr.hpp>
+
+#include <set>
+
+#include <boost/archive/detail/abi_prefix.hpp> // must be the last header
+
+namespace boost {
+namespace serialization {
+    class extended_type_info;
+} // namespace serialization
+
+namespace archive {
+namespace detail {
+
+//////////////////////////////////////////////////////////////////////
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_archive_impl
+{
+};
+
+} // namespace detail
+} // namespace serialization
+} // namespace boost
+
+#include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
+
+#endif //BOOST_ARCHIVE_DETAIL_BASIC_ARCHIVE_IMPL_HPP
+
+
+
@@ -0,0 +1,45 @@
+#ifndef BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP
+#define BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP
+
+// MS compatible compilers support #pragma once
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+//  basic_config.hpp  ---------------------------------------------//
+
+//  (c) Copyright Robert Ramey 2004
+//  Use, modification, and distribution is subject to the Boost Software
+//  License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+//  See library home page at http://www.boost.org/libs/serialization
+
+//----------------------------------------------------------------------------// 
+
+// This header implements separate compilation features as described in
+// http://www.boost.org/more/separate_compilation.html
+
+#include <boost/config.hpp>
+
+#ifdef BOOST_HAS_DECLSPEC // defined in config system
+// we need to import/export our code only if the user has specifically
+// asked for it by defining either BOOST_ALL_DYN_LINK if they want all boost
+// libraries to be dynamically linked, or BOOST_ARCHIVE_DYN_LINK
+// if they want just this one to be dynamically linked:
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_ARCHIVE_DYN_LINK)
+// export if this is our own source, otherwise import:
+#ifdef BOOST_ARCHIVE_SOURCE
+# define BOOST_ARCHIVE_DECL __declspec(dllexport)
+#else
+# define BOOST_ARCHIVE_DECL __declspec(dllimport)
+#endif  // BOOST_ARCHIVE_SOURCE
+#endif  // DYN_LINK
+#endif  // BOOST_HAS_DECLSPEC
+//
+// if BOOST_ARCHIVE_DECL isn't defined yet define it now:
+#ifndef BOOST_ARCHIVE_DECL
+#define BOOST_ARCHIVE_DECL
+#endif
+
+#endif // BOOST_ARCHIVE_DETAIL_BASIC_CONFIG_HPP
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_BASIC_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -17,15 +17,15 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 // can't use this - much as I'd like to as borland doesn't support it
+// #include <boost/scoped_ptr.hpp>

 #include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>

+#include <boost/type_traits/broken_compiler_spec.hpp>
 #include <boost/serialization/tracking_enum.hpp>
 #include <boost/archive/basic_archive.hpp>
 #include <boost/archive/detail/decl.hpp>
-#include <boost/archive/detail/helper_collection.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

 namespace boost {
@@ -37,18 +37,18 @@ namespace archive {
 namespace detail {

 class basic_iarchive_impl;
-class basic_iserializer;
-class basic_pointer_iserializer;
-
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;
 //////////////////////////////////////////////////////////////////////
 // class basic_iarchive - read serialized objects from a input stream
-class BOOST_SYMBOL_VISIBLE basic_iarchive :
-    private boost::noncopyable,
-    public boost::archive::detail::helper_collection
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive :
+    private boost::noncopyable
 {
    friend class basic_iarchive_impl;
    // hide implementation of this class to minimize header conclusion
-    boost::scoped_ptr<basic_iarchive_impl> pimpl;
+    // in client code. I couldn't used scoped pointer with borland
+    // boost::scoped_ptr<basic_iarchive_impl> pimpl;
+    basic_iarchive_impl * pimpl;

    virtual void vload(version_type &t) =  0;
    virtual void vload(object_id_type &t) =  0;
@@ -57,42 +57,41 @@ class BOOST_SYMBOL_VISIBLE basic_iarchive :
    virtual void vload(class_name_type &t) = 0;
    virtual void vload(tracking_type &t) = 0;
 protected:
-    BOOST_ARCHIVE_DECL basic_iarchive(unsigned int flags);
-    boost::archive::detail::helper_collection &
-    get_helper_collection(){
-        return *this;
-    }
+    basic_iarchive(unsigned int flags);
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_iarchive();
 public:
-    // some msvc versions require that the following function be public
-    // otherwise it should really protected.
-    virtual BOOST_ARCHIVE_DECL ~basic_iarchive();
    // note: NOT part of the public API.
-    BOOST_ARCHIVE_DECL void next_object_pointer(void *t);
-    BOOST_ARCHIVE_DECL void register_basic_serializer(
+    void next_object_pointer(void *t);
+    void register_basic_serializer(
        const basic_iserializer & bis
    );
-    BOOST_ARCHIVE_DECL void load_object(
+    void load_object(
        void *t, 
        const basic_iserializer & bis
    );
-    BOOST_ARCHIVE_DECL const basic_pointer_iserializer * 
+    const basic_pointer_iserializer * 
    load_pointer(
        void * & t, 
        const basic_pointer_iserializer * bpis_ptr,
        const basic_pointer_iserializer * (*finder)(
            const boost::serialization::extended_type_info & eti
        )
+
    );
    // real public API starts here
-    BOOST_ARCHIVE_DECL void 
+    void 
    set_library_version(library_version_type archive_library_version);
-    BOOST_ARCHIVE_DECL library_version_type 
+    library_version_type 
    get_library_version() const;
-    BOOST_ARCHIVE_DECL unsigned int
+    unsigned int
    get_flags() const;
-    BOOST_ARCHIVE_DECL void 
+    void 
    reset_object_address(const void * new_address, const void * old_address);
-    BOOST_ARCHIVE_DECL void 
+    void 
    delete_created_pointers();
 };

@@ -100,6 +99,12 @@ public:
 } // namespace archive
 } // namespace boost

+// required by smart_cast for compilers not implementing 
+// partial template specialization
+BOOST_TT_BROKEN_COMPILER_SPEC(
+    boost::archive::detail::basic_iarchive  
+) 
+
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas

 #endif //BOOST_ARCHIVE_DETAIL_BASIC_IARCHIVE_HPP
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_BASIC_ISERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -39,19 +39,23 @@ namespace serialization {
 namespace archive {
 namespace detail {

-class basic_iarchive;
-class basic_pointer_iserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;

-class BOOST_SYMBOL_VISIBLE basic_iserializer : 
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer : 
    public basic_serializer
 {
 private:
    basic_pointer_iserializer *m_bpis;
 protected:
-    explicit BOOST_ARCHIVE_DECL basic_iserializer(
+    explicit basic_iserializer(
        const boost::serialization::extended_type_info & type
    );
-    virtual BOOST_ARCHIVE_DECL ~basic_iserializer();
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_iserializer();
 public:
    bool serialized_as_pointer() const {
        return m_bpis != NULL;
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -19,11 +19,15 @@
 #include <cstddef> // NULL
 #include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
+
+#include <boost/type_traits/broken_compiler_spec.hpp>
+
+// can't use this - much as I'd like to as borland doesn't support it
+// #include <boost/scoped_ptr.hpp>

 #include <boost/archive/basic_archive.hpp>
 #include <boost/serialization/tracking_enum.hpp>
-#include <boost/archive/detail/helper_collection.hpp>
+
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

 namespace boost {
@@ -35,18 +39,18 @@ namespace archive {
 namespace detail {

 class basic_oarchive_impl;
-class basic_oserializer;
-class basic_pointer_oserializer;
-
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;
 //////////////////////////////////////////////////////////////////////
 // class basic_oarchive - write serialized objects to an output stream
-class BOOST_SYMBOL_VISIBLE basic_oarchive :
-    private boost::noncopyable,
-    public boost::archive::detail::helper_collection
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oarchive :
+    private boost::noncopyable
 {
    friend class basic_oarchive_impl;
    // hide implementation of this class to minimize header conclusion
-    boost::scoped_ptr<basic_oarchive_impl> pimpl;
+    // in client code. note: borland can't use scoped_ptr
+    //boost::scoped_ptr<basic_oarchive_impl> pimpl;
+    basic_oarchive_impl * pimpl;

    // overload these to bracket object attributes. Used to implement
    // xml archives
@@ -59,20 +63,22 @@ class BOOST_SYMBOL_VISIBLE basic_oarchive :
    virtual void vsave(const class_name_type & t) = 0;
    virtual void vsave(const tracking_type t) = 0;
 protected:
-    BOOST_ARCHIVE_DECL basic_oarchive(unsigned int flags = 0);
-    BOOST_ARCHIVE_DECL boost::archive::detail::helper_collection &
-    get_helper_collection();
-    virtual BOOST_ARCHIVE_DECL ~basic_oarchive();
+    basic_oarchive(unsigned int flags = 0);
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_oarchive();
 public:
    // note: NOT part of the public interface
-    BOOST_ARCHIVE_DECL void register_basic_serializer(
+    void register_basic_serializer(
        const basic_oserializer & bos
    );
-    BOOST_ARCHIVE_DECL void save_object(
+    void save_object(
        const void *x, 
        const basic_oserializer & bos
    );
-    BOOST_ARCHIVE_DECL void save_pointer(
+    void save_pointer(
        const void * t, 
        const basic_pointer_oserializer * bpos_ptr
    );
@@ -80,15 +86,21 @@ public:
        vsave(NULL_POINTER_TAG);
    }
    // real public interface starts here
-    BOOST_ARCHIVE_DECL void end_preamble(); // default implementation does nothing
-    BOOST_ARCHIVE_DECL library_version_type get_library_version() const;
-    BOOST_ARCHIVE_DECL unsigned int get_flags() const;
+    void end_preamble(); // default implementation does nothing
+    library_version_type get_library_version() const;
+    unsigned int get_flags() const;
 };

 } // namespace detail
 } // namespace archive
 } // namespace boost

+// required by smart_cast for compilers not implementing 
+// partial template specialization
+BOOST_TT_BROKEN_COMPILER_SPEC(
+    boost::archive::detail::basic_oarchive
+)
+
 #include <boost/archive/detail/abi_suffix.hpp> // pops abi_suffix.hpp pragmas

 #endif //BOOST_ARCHIVE_BASIC_OARCHIVE_HPP
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZATION_BASIC_OSERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -40,19 +40,23 @@ namespace serialization {
 namespace archive {
 namespace detail {

-class basic_oarchive;
-class basic_pointer_oserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oarchive;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;

-class BOOST_SYMBOL_VISIBLE basic_oserializer :
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer : 
    public basic_serializer
 {
 private:
    basic_pointer_oserializer *m_bpos;
 protected:
-    explicit BOOST_ARCHIVE_DECL basic_oserializer(
+    explicit basic_oserializer(
        const boost::serialization::extended_type_info & type_
    );
-    virtual BOOST_ARCHIVE_DECL ~basic_oserializer();
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_oserializer();
 public:
    bool serialized_as_pointer() const {
        return m_bpos != NULL;
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_POINTER_ISERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -37,22 +37,25 @@ namespace serialization {
 namespace archive {
 namespace detail {

-class basic_iarchive;
-class basic_iserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iarchive;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_iserializer;

-class BOOST_SYMBOL_VISIBLE basic_pointer_iserializer
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer 
    : public basic_serializer {
 protected:
-    explicit BOOST_ARCHIVE_DECL basic_pointer_iserializer(
+    explicit basic_pointer_iserializer(
        const boost::serialization::extended_type_info & type_
    );
-    virtual BOOST_ARCHIVE_DECL ~basic_pointer_iserializer();
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_pointer_iserializer();
 public:
-    virtual void * heap_allocation() const = 0;
    virtual const basic_iserializer & get_basic_serializer() const = 0;
    virtual void load_object_ptr(
        basic_iarchive & ar, 
-        void * x,
+        void * & x,
        const unsigned int file_version
    ) const = 0;
 };
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_POINTER_OSERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -36,18 +36,22 @@ namespace serialization {
 namespace archive {
 namespace detail {

-class basic_oarchive;
-class basic_oserializer;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oarchive;
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_oserializer;

-class BOOST_SYMBOL_VISIBLE basic_pointer_oserializer : 
+class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer : 
    public basic_serializer
 {
 protected:
-    explicit BOOST_ARCHIVE_DECL basic_pointer_oserializer(
+    explicit basic_pointer_oserializer(
        const boost::serialization::extended_type_info & type_
    );
 public:
-    virtual BOOST_ARCHIVE_DECL ~basic_pointer_oserializer();
+    // account for bogus gcc warning
+    #if defined(__GNUC__)
+    virtual
+    #endif
+    ~basic_pointer_oserializer();
    virtual const basic_oserializer & get_basic_serializer() const = 0;
    virtual void save_object_ptr(
        basic_oarchive & ar,
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BASIC_SERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -41,7 +41,9 @@ protected:
        const boost::serialization::extended_type_info & eti
    ) : 
        m_eti(& eti)
-    {}
+    {
+        BOOST_ASSERT(NULL != & eti);
+    }
 public:
    inline bool 
    operator<(const basic_serializer & rhs) const {
@@ -2,7 +2,7 @@
 #define BOOST_SERIALIZER_MAP_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -19,7 +19,7 @@
 #include <set>

 #include <boost/config.hpp>
-#include <boost/noncopyable.hpp>
+#include <boost/utility.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>

 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -34,7 +34,7 @@ namespace detail {

 class basic_serializer;

-class BOOST_SYMBOL_VISIBLE
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY())
 basic_serializer_map : public
    boost::noncopyable
 {
@@ -50,9 +50,9 @@ basic_serializer_map : public
    > map_type;
    map_type m_map;
 public:
-    BOOST_ARCHIVE_DECL bool insert(const basic_serializer * bs);
-    BOOST_ARCHIVE_DECL void erase(const basic_serializer * bs);
-    BOOST_ARCHIVE_DECL const basic_serializer * find(
+    bool insert(const basic_serializer * bs);
+    void erase(const basic_serializer * bs);
+    const basic_serializer * find(
        const boost::serialization::extended_type_info & type_
    ) const;
 private:
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_CHECK_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #pragma inline_depth(511)
 #pragma inline_recursion(on)
@@ -50,7 +50,7 @@ namespace detail {
 template<class T>
 inline void check_object_level(){
    typedef 
-        typename mpl::greater_equal<
+        BOOST_DEDUCED_TYPENAME mpl::greater_equal<
            serialization::implementation_level< T >,
            mpl::int_<serialization::primitive_type>
        >::type typex;
@@ -63,12 +63,12 @@ inline void check_object_level(){
 template<class T>
 inline void check_object_versioning(){
    typedef 
-        typename mpl::or_<
-            typename mpl::greater<
+        BOOST_DEDUCED_TYPENAME mpl::or_<
+            BOOST_DEDUCED_TYPENAME mpl::greater<
                serialization::implementation_level< T >,
                mpl::int_<serialization::object_serializable>
            >,
-            typename mpl::equal_to<
+            BOOST_DEDUCED_TYPENAME mpl::equal_to<
                serialization::version< T >,
                mpl::int_<0>
            >
@@ -83,7 +83,7 @@ inline void check_object_tracking(){
    // presume it has already been determined that
    // T is not a const
    BOOST_STATIC_ASSERT(! boost::is_const< T >::value);
-    typedef typename mpl::equal_to<
+    typedef BOOST_DEDUCED_TYPENAME mpl::equal_to<
        serialization::tracking_level< T >,
        mpl::int_<serialization::track_never>
    >::type typex;
@@ -105,13 +105,13 @@ inline void check_pointer_level(){
    // we should only invoke this once we KNOW that T
    // has been used as a pointer!!
    typedef 
-        typename mpl::or_<
-            typename mpl::greater<
+        BOOST_DEDUCED_TYPENAME mpl::or_<
+            BOOST_DEDUCED_TYPENAME mpl::greater<
                serialization::implementation_level< T >,
                mpl::int_<serialization::object_serializable>
            >,
-            typename mpl::not_<
-                typename mpl::equal_to<
+            BOOST_DEDUCED_TYPENAME mpl::not_<
+                BOOST_DEDUCED_TYPENAME mpl::equal_to<
                    serialization::tracking_level< T >,
                    mpl::int_<serialization::track_selectively>
                >
@@ -139,7 +139,7 @@ inline void check_pointer_level(){

 template<class T>
 void inline check_pointer_tracking(){
-    typedef typename mpl::greater<
+    typedef BOOST_DEDUCED_TYPENAME mpl::greater<
        serialization::tracking_level< T >,
        mpl::int_<serialization::track_never>
    >::type typex;
@@ -151,10 +151,10 @@ void inline check_pointer_tracking(){
 template<class T>
 inline void check_const_loading(){
    typedef
-        typename mpl::or_<
-            typename boost::serialization::is_wrapper< T >,
-            typename mpl::not_<
-                typename boost::is_const< T >
+        BOOST_DEDUCED_TYPENAME mpl::or_<
+            BOOST_DEDUCED_TYPENAME boost::serialization::is_wrapper< T >,
+            BOOST_DEDUCED_TYPENAME mpl::not_<
+                BOOST_DEDUCED_TYPENAME boost::is_const< T >
            >
        >::type typex;
    // cannot load data into a "const" object unless it's a
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_COMMON_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -35,7 +35,7 @@ class extended_type_info;

 // note: referred to as Curiously Recurring Template Patter (CRTP)
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE common_iarchive : 
+class common_iarchive : 
    public basic_iarchive,
    public interface_iarchive<Archive>
 {
@@ -62,7 +62,7 @@ private:
 protected:
    // default processing - invoke serialization library
    template<class T>
-    void load_override(T & t){
+    void load_override(T & t, BOOST_PFTO int){
        archive::load(* this->This(), t);
    }
    // default implementations of functions which emit start/end tags for
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_COMMON_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -32,8 +32,7 @@ namespace detail {

 // note: referred to as Curiously Recurring Template Patter (CRTP)
 template<class Archive>
-
-class BOOST_SYMBOL_VISIBLE common_oarchive :
+class common_oarchive : 
    public basic_oarchive,
    public interface_oarchive<Archive>
 {
@@ -66,7 +65,7 @@ private:
 protected:
    // default processing - invoke serialization library
    template<class T>
-    void save_override(T & t){
+    void save_override(T & t, BOOST_PFTO int){
        archive::save(* this->This(), t);
    }
    void save_start(const char * /*name*/){}
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_DECL_HPP 

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif 

@@ -22,36 +22,58 @@
 // http://www.boost.org/more/separate_compilation.html

 #include <boost/config.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>

-#if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK))
-    #if defined(BOOST_ARCHIVE_SOURCE)
-        #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_EXPORT
-    #else
-        #define BOOST_ARCHIVE_DECL BOOST_SYMBOL_IMPORT
+#if defined(BOOST_HAS_DECLSPEC)
+    #if (defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SERIALIZATION_DYN_LINK))
+        #if defined(BOOST_ARCHIVE_SOURCE)
+            #if defined(__BORLANDC__)
+            #define BOOST_ARCHIVE_DECL(T) T __export
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T)  T __export
+            #else
+            #define BOOST_ARCHIVE_DECL(T) __declspec(dllexport) T
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T)  __declspec(dllexport) T
+            #endif
+        #else
+            #if defined(__BORLANDC__)
+            #define BOOST_ARCHIVE_DECL(T) T __import
+            #else
+            #define BOOST_ARCHIVE_DECL(T) __declspec(dllimport) T
+            #endif
+        #endif
+        #if defined(BOOST_WARCHIVE_SOURCE)
+            #if defined(__BORLANDC__)
+            #define BOOST_WARCHIVE_DECL(T) T __export
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T) T __export
+            #else
+            #define BOOST_WARCHIVE_DECL(T) __declspec(dllexport) T
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T) __declspec(dllexport) T
+            #endif
+        #else
+            #if defined(__BORLANDC__)
+            #define BOOST_WARCHIVE_DECL(T) T __import
+            #else
+            #define BOOST_WARCHIVE_DECL(T) __declspec(dllimport) T
+            #endif
+        #endif
+        #if !defined(BOOST_WARCHIVE_SOURCE) && !defined(BOOST_ARCHIVE_SOURCE)
+            #if defined(__BORLANDC__)
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T) T __import
+            #else
+            #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T) __declspec(dllimport) T
+            #endif
+        #endif
    #endif
-
-    #if defined(BOOST_WARCHIVE_SOURCE)
-        #define BOOST_WARCHIVE_DECL BOOST_SYMBOL_EXPORT
-    #else
-        #define BOOST_WARCHIVE_DECL BOOST_SYMBOL_IMPORT
-    #endif
-
-    #if defined(BOOST_WARCHIVE_SOURCE) || defined(BOOST_ARCHIVE_SOURCE)
-        #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_EXPORT
-    #else
-        #define BOOST_ARCHIVE_OR_WARCHIVE_DECL BOOST_SYMBOL_IMPORT
-    #endif
-
-#endif
+#endif // BOOST_HAS_DECLSPEC

 #if ! defined(BOOST_ARCHIVE_DECL)
-    #define BOOST_ARCHIVE_DECL
+    #define BOOST_ARCHIVE_DECL(T) T
 #endif
 #if ! defined(BOOST_WARCHIVE_DECL)
-    #define BOOST_WARCHIVE_DECL
+    #define BOOST_WARCHIVE_DECL(T) T
 #endif
 #if ! defined(BOOST_ARCHIVE_OR_WARCHIVE_DECL)
-    #define BOOST_ARCHIVE_OR_WARCHIVE_DECL
+    #define BOOST_ARCHIVE_OR_WARCHIVE_DECL(T) T
 #endif

 #endif // BOOST_ARCHIVE_DETAIL_DECL_HPP
@@ -1,99 +0,0 @@
-#ifndef BOOST_ARCHIVE_DETAIL_HELPER_COLLECTION_HPP
-#define BOOST_ARCHIVE_DETAIL_HELPER_COLLECTION_HPP
-
-// MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// helper_collection.hpp: archive support for run-time helpers
-
-// (C) Copyright 2002-2008 Robert Ramey and Joaquin M Lopez Munoz
-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for updates, documentation, and revision history.
-
-#include <cstddef> // NULL
-#include <vector>
-#include <utility>
-#include <memory>
-#include <algorithm>
-
-#include <boost/config.hpp>
-
-#include <boost/smart_ptr/shared_ptr.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
-namespace boost {
-
-namespace archive {
-namespace detail {
-
-class helper_collection
-{
-    helper_collection(const helper_collection&);              // non-copyable
-    helper_collection& operator = (const helper_collection&); // non-copyable
-
-    // note: we dont' actually "share" the function object pointer
-    // we only use shared_ptr to make sure that it get's deleted
-
-    typedef std::pair<
-        const void *,
-        boost::shared_ptr<void>
-    > helper_value_type;
-    template<class T>
-    boost::shared_ptr<void> make_helper_ptr(){
-        // use boost::shared_ptr rather than std::shared_ptr to maintain
-        // c++03 compatibility
-        return boost::make_shared<T>();
-    }
-
-    typedef std::vector<helper_value_type> collection;
-    collection m_collection;
-
-    struct predicate {
-        BOOST_DELETED_FUNCTION(predicate & operator=(const predicate & rhs))
-    public:
-        const void * const m_ti;
-        bool operator()(helper_value_type const &rhs) const {
-            return m_ti == rhs.first;
-        }
-        predicate(const void * ti) :
-            m_ti(ti)
-        {}
-    };
-protected:
-    helper_collection(){}
-    ~helper_collection(){}
-public:
-    template<typename Helper>
-    Helper& find_helper(void * const id = 0) {
-        collection::const_iterator it =
-            std::find_if(
-                m_collection.begin(),
-                m_collection.end(),
-                predicate(id)
-            );
-
-        void * rval = 0;
-        if(it == m_collection.end()){
-            m_collection.push_back(
-                std::make_pair(id, make_helper_ptr<Helper>())
-            );
-            rval = m_collection.back().second.get();
-        }
-        else{
-            rval = it->second.get();
-        }
-        return *static_cast<Helper *>(rval);
-    }
-};
-
-} // namespace detail
-} // namespace serialization
-} // namespace boost
-
-#endif // BOOST_ARCHIVE_DETAIL_HELPER_COLLECTION_HPP
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_INTERFACE_IARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -20,7 +20,6 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/iserializer.hpp>
-#include <boost/archive/detail/helper_collection.hpp>
 #include <boost/serialization/singleton.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

@@ -28,7 +27,7 @@ namespace boost {
 namespace archive {
 namespace detail {

-class basic_pointer_iserializer;
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_iserializer;

 template<class Archive>
 class interface_iarchive 
@@ -56,16 +55,9 @@ public:
        this->This()->register_basic_serializer(bpis.get_basic_serializer());
        return & bpis;
    }
-    template<class Helper>
-    Helper &
-    get_helper(void * const id = 0){
-        helper_collection & hc = this->This()->get_helper_collection();
-        return hc.template find_helper<Helper>(id);
-    }
-    
    template<class T>
    Archive & operator>>(T & t){
-        this->This()->load_override(t);
+        this->This()->load_override(t, 0);
        return * this->This();
    }

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_INTERFACE_OARCHIVE_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #endif

@@ -29,7 +29,7 @@ namespace boost {
 namespace archive {
 namespace detail {

-class basic_pointer_oserializer;
+class BOOST_ARCHIVE_OR_WARCHIVE_DECL(BOOST_PP_EMPTY()) basic_pointer_oserializer;

 template<class Archive>
 class interface_oarchive 
@@ -57,24 +57,21 @@ public:
        this->This()->register_basic_serializer(bpos.get_basic_serializer());
        return & bpos;
    }
-    
-    template<class Helper>
-    Helper &
-    get_helper(void * const id = 0){
-        helper_collection & hc = this->This()->get_helper_collection();
-        return hc.template find_helper<Helper>(id);
-    }

    template<class T>
-    Archive & operator<<(const T & t){
-        this->This()->save_override(t);
+    Archive & operator<<(T & t){
+        this->This()->save_override(t, 0);
        return * this->This();
    }
    
    // the & operator 
    template<class T>
-    Archive & operator&(const T & t){
-        return * this ->This() << t;
+    Archive & operator&(T & t){
+        #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+            return * this->This() << const_cast<const T &>(t);
+        #else
+            return * this->This() << t;
+        #endif
    }
 };

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_DETAIL_ISERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #pragma inline_depth(511)
 #pragma inline_recursion(on)
@@ -23,6 +23,7 @@
 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <new>     // for placement new
+#include <memory>  // for auto_ptr
 #include <cstddef> // size_t, NULL

 #include <boost/config.hpp>
@@ -39,7 +40,8 @@ namespace std{
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/greater_equal.hpp>
 #include <boost/mpl/equal_to.hpp>
-#include <boost/core/no_exceptions_support.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/detail/no_exceptions_support.hpp>

 #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
    #include <boost/serialization/extended_type_info_typeid.hpp>   
@@ -57,14 +59,12 @@ namespace std{

 #include <boost/serialization/assume_abstract.hpp>

-#ifndef BOOST_MSVC
-    #define DONT_USE_HAS_NEW_OPERATOR (                    \
-           BOOST_WORKAROUND(__IBMCPP__, < 1210)            \
-        || defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590)   \
-    )
-#else
-    #define DONT_USE_HAS_NEW_OPERATOR 0
-#endif
+#define DONT_USE_HAS_NEW_OPERATOR (                    \
+    defined(__BORLANDC__)                              \
+    || defined(__IBMCPP__)                             \
+    || defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)     \
+    || defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590)   \
+)

 #if ! DONT_USE_HAS_NEW_OPERATOR
 #include <boost/type_traits/has_new_operator.hpp>
@@ -127,7 +127,7 @@ protected:
    explicit iserializer() :
        basic_iserializer(
            boost::serialization::singleton<
-                typename 
+                BOOST_DEDUCED_TYPENAME 
                boost::serialization::type_info_implementation< T >::type
            >::get_const_instance()
        )
@@ -197,105 +197,11 @@ BOOST_DLLEXPORT void iserializer<Archive, T>::load_object_data(
 #  pragma warning(disable : 4511 4512)
 #endif

-// the purpose of this code is to allocate memory for an object
-// without requiring the constructor to be called.  Presumably
-// the allocated object will be subsequently initialized with
-// "placement new". 
-// note: we have the boost type trait has_new_operator but we
-// have no corresponding has_delete_operator.  So we presume
-// that the former being true would imply that the a delete
-// operator is also defined for the class T.
-
-template<class T>
-struct heap_allocation {
-    // boost::has_new_operator< T > doesn't work on these compilers
-    #if DONT_USE_HAS_NEW_OPERATOR
-        // This doesn't handle operator new overload for class T
-        static T * invoke_new(){
-            return static_cast<T *>(operator new(sizeof(T)));
-        }
-        static void invoke_delete(T *t){
-            (operator delete(t));
-        }
-    #else
-        // note: we presume that a true value for has_new_operator
-        // implies the existence of a class specific delete operator as well
-        // as a class specific new operator.
-        struct has_new_operator {
-            static T * invoke_new() {
-                return static_cast<T *>((T::operator new)(sizeof(T)));
-            }
-            static void invoke_delete(T * t) {
-                // if compilation fails here, the likely cause that the class
-                // T has a class specific new operator but no class specific
-                // delete operator which matches the following signature.
-                // note that this solution addresses the issue that two
-                // possible signatures.  But it doesn't address the possibility
-                // that the class might have class specific new with NO
-                // class specific delete at all.  Patches (compatible with
-                // C++03) welcome!
-                delete t;
-            }
-        };
-        struct doesnt_have_new_operator {
-            static T* invoke_new() {
-                return static_cast<T *>(operator new(sizeof(T)));
-            }
-            static void invoke_delete(T * t) {
-                // Note: I'm reliance upon automatic conversion from T * to void * here
-                delete t;
-            }
-        };
-        static T * invoke_new() {
-            typedef typename
-                mpl::eval_if<
-                    boost::has_new_operator< T >,
-                    mpl::identity<has_new_operator >,
-                    mpl::identity<doesnt_have_new_operator >    
-                >::type typex;
-            return typex::invoke_new();
-        }
-        static void invoke_delete(T *t) {
-            typedef typename
-                mpl::eval_if<
-                    boost::has_new_operator< T >,
-                    mpl::identity<has_new_operator >,
-                    mpl::identity<doesnt_have_new_operator >    
-                >::type typex;
-            typex::invoke_delete(t);
-        }
-    #endif
-    explicit heap_allocation(){
-        m_p = invoke_new();
-    }
-    ~heap_allocation(){
-        if (0 != m_p)
-            invoke_delete(m_p);
-    }
-    T* get() const {
-        return m_p;
-    }
-
-    T* release() {
-        T* p = m_p;
-        m_p = 0;
-        return p;
-    }
-private:
-    T* m_p;
-};
-
 template<class Archive, class T>
 class pointer_iserializer :
    public basic_pointer_iserializer
 {
 private:
-    virtual void * heap_allocation() const {
-        detail::heap_allocation<T> h;
-        T * t = h.get();
-        h.release();
-        return t;
-    }
    virtual const basic_iserializer & get_basic_serializer() const {
        return boost::serialization::singleton<
            iserializer<Archive, T>
@@ -303,7 +209,7 @@ private:
    }
    BOOST_DLLEXPORT virtual void load_object_ptr(
        basic_iarchive & ar, 
-        void * x,
+        void * & x,
        const unsigned int file_version
    ) const BOOST_USED;
 protected:
@@ -316,50 +222,121 @@ protected:
 #  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.
+// otherwise it would have been ideal
+//struct heap_allocator : public T 
+//{
+//    T * invoke(){
+//        return ::new(sizeof(T));
+//    }
+//}
+
+template<class T>
+struct heap_allocator
+{
+    // boost::has_new_operator< T > doesn't work on these compilers
+    #if DONT_USE_HAS_NEW_OPERATOR
+        // This doesn't handle operator new overload for class T
+        static T * invoke(){
+            return static_cast<T *>(operator new(sizeof(T)));
+        }
+    #else
+        struct has_new_operator {
+            static T* invoke() {
+                return static_cast<T *>((T::operator new)(sizeof(T)));
+            }
+        };
+        struct doesnt_have_new_operator {
+            static T* invoke() {
+                return static_cast<T *>(operator new(sizeof(T)));
+            }
+        };
+        static T * invoke() {
+            typedef BOOST_DEDUCED_TYPENAME
+                mpl::eval_if<
+                    boost::has_new_operator< T >,
+                    mpl::identity<has_new_operator >,
+                    mpl::identity<doesnt_have_new_operator >    
+                >::type typex;
+            return typex::invoke();
+        }
+    #endif
+};
+
+// due to Martin Ecker
+template <typename T>
+class auto_ptr_with_deleter
+{
+public:
+    explicit auto_ptr_with_deleter(T* p) :
+        m_p(p)
+    {}
+    ~auto_ptr_with_deleter(){
+        if (m_p)
+            boost::serialization::access::destroy(m_p);
+    }
+    T* get() const {
+        return m_p;
+    }
+
+    T* release() {
+        T* p = m_p;
+        m_p = NULL;
+        return p;
+    }
+private:
+    T* m_p;
+};
+
 // note: BOOST_DLLEXPORT is so that code for polymorphic class
 // serialized only through base class won't get optimized out
 template<class Archive, class T>
 BOOST_DLLEXPORT void pointer_iserializer<Archive, T>::load_object_ptr(
    basic_iarchive & ar, 
-    void * t,
+    void * & x,
    const unsigned int file_version
 ) const
 {
    Archive & ar_impl = 
        boost::serialization::smart_cast_reference<Archive &>(ar);

-    // note that the above will throw std::bad_alloc if the allocation
-    // fails so we don't have to address this contingency here.
+    auto_ptr_with_deleter< T > ap(heap_allocator< T >::invoke());
+    if(NULL == ap.get())
+        boost::serialization::throw_exception(std::bad_alloc()) ;
+
+    T * t = ap.get();
+    x = t;

    // catch exception during load_construct_data so that we don't
    // automatically delete the t which is most likely not fully
    // constructed
    BOOST_TRY {
-        // this addresses an obscure situation that occurs when 
+        // this addresses an obscure situtation that occurs when 
        // load_constructor de-serializes something through a pointer.
        ar.next_object_pointer(t);
        boost::serialization::load_construct_data_adl<Archive, T>(
            ar_impl,
-            static_cast<T *>(t),
+            t, 
            file_version
        );
    }
    BOOST_CATCH(...){
-        // if we get here the load_construct failed.  The heap_allocation
-        // will be automatically deleted so we don't have to do anything
-        // special here.
+        ap.release();
        BOOST_RETHROW;
    }
    BOOST_CATCH_END

-    ar_impl >> boost::serialization::make_nvp(NULL, * static_cast<T *>(t));
+    ar_impl >> boost::serialization::make_nvp(NULL, * t);
+    ap.release();
 }

 template<class Archive, class T>
 pointer_iserializer<Archive, T>::pointer_iserializer() :
    basic_pointer_iserializer(
        boost::serialization::singleton<
-            typename 
+            BOOST_DEDUCED_TYPENAME 
            boost::serialization::type_info_implementation< T >::type
        >::get_const_instance()
    )
@@ -428,7 +405,7 @@ struct load_non_pointer_type {

    template<class T>
    static void invoke(Archive & ar, T &t){
-        typedef typename mpl::eval_if<
+        typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
                // if its primitive
                mpl::equal_to<
                    boost::serialization::implementation_level< T >,
@@ -436,7 +413,7 @@ struct load_non_pointer_type {
                >,
                mpl::identity<load_primitive>,
            // else
-            typename mpl::eval_if<
+            BOOST_DEDUCED_TYPENAME mpl::eval_if<
            // class info / version
            mpl::greater_equal<
                        boost::serialization::implementation_level< T >,
@@ -445,7 +422,7 @@ struct load_non_pointer_type {
            // do standard load
            mpl::identity<load_standard>,
        // else
-        typename mpl::eval_if<
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<
            // no tracking
                    mpl::equal_to<
                        boost::serialization::tracking_level< T >,
@@ -489,7 +466,7 @@ struct load_pointer_type {
        // class pointer.  Inhibiting code generation for this
        // permits abstract base classes to be used - note: exception
        // virtual serialize functions used for plug-ins
-        typedef typename
+        typedef BOOST_DEDUCED_TYPENAME
            mpl::eval_if<
                boost::serialization::is_abstract<const T>,
                boost::mpl::identity<abstract>,
@@ -505,21 +482,18 @@ struct load_pointer_type {
        const T &
    ) {
        // tweak the pointer back to the base class
-        void * upcast = const_cast<void *>(
-            boost::serialization::void_upcast(
-                eti,
-                boost::serialization::singleton<
-                    typename 
-                    boost::serialization::type_info_implementation< T >::type
-                >::get_const_instance(),
-                t
+        return static_cast<T *>(
+            const_cast<void *>(
+                boost::serialization::void_upcast(
+                    eti,
+                    boost::serialization::singleton<
+                        BOOST_DEDUCED_TYPENAME 
+                        boost::serialization::type_info_implementation< T >::type
+                    >::get_const_instance(),
+                    t
+                )
            )
        );
-        if(NULL == upcast)
-            boost::serialization::throw_exception(
-                archive_exception(archive_exception::unregistered_class)
-            );
-        return static_cast<T *>(upcast);
    }

    template<class T>
@@ -570,7 +544,7 @@ template<class Archive>
 struct load_array_type {
    template<class T>
    static void invoke(Archive &ar, T &t){
-        typedef typename remove_extent< T >::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME remove_extent< T >::type value_type;
        
        // convert integers to correct enum to load
        // determine number of elements in the array. Consider the
@@ -588,14 +562,7 @@ struct load_array_type {
                    boost::archive::archive_exception::array_size_too_short
                )
            );
-        // explict template arguments to pass intel C++ compiler
-        ar >> serialization::make_array<
-            value_type,
-            boost::serialization::collection_size_type
-        >(
-            static_cast<value_type *>(&t[0]),
-            count
-        );
+        ar >> serialization::make_array(static_cast<value_type*>(&t[0]),count);
    }
 };

@@ -609,13 +576,13 @@ inline void load(Archive & ar, T &t){
    // handled below.
    detail::check_const_loading< T >();
    typedef
-        typename mpl::eval_if<is_pointer< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_pointer< T >,
            mpl::identity<detail::load_pointer_type<Archive> >
        ,//else
-        typename mpl::eval_if<is_array< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_array< T >,
            mpl::identity<detail::load_array_type<Archive> >
        ,//else
-        typename mpl::eval_if<is_enum< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_enum< T >,
            mpl::identity<detail::load_enum_type<Archive> >
        ,//else
            mpl::identity<detail::load_non_pointer_type<Archive> >
@@ -625,6 +592,40 @@ inline void load(Archive & ar, T &t){
    typex::invoke(ar, t);
 }

+#if 0
+
+// BORLAND
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x560))
+// borland has a couple of problems
+// a) if function is partially specialized - see below
+// const paramters are transformed to non-const ones
+// b) implementation of base_object can't be made to work
+// correctly which results in all base_object s being const.
+// So, strip off the const for borland.  This breaks the trap
+// for loading const objects - but I see no alternative
+template<class Archive, class T>
+inline void load(Archive &ar, const T & t){
+    load(ar, const_cast<T &>(t));
+}
+#endif
+
+// let wrappers through.
+#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
+template<class Archive, class T>
+inline void load_wrapper(Archive &ar, const T&t, mpl::true_){
+    boost::archive::load(ar, const_cast<T&>(t));
+}
+
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x560))
+template<class Archive, class T>
+inline void load(Archive &ar, const T&t){
+  load_wrapper(ar,t,serialization::is_wrapper< T >());
+}
+#endif 
+#endif
+
+#endif
+
 } // namespace archive
 } // namespace boost

@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_OSERIALIZER_HPP

 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
 # pragma once
 #pragma inline_depth(511)
 #pragma inline_recursion(on)
@@ -33,7 +33,6 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/greater_equal.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/bool_fwd.hpp>

 #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO   
    #include <boost/serialization/extended_type_info_typeid.hpp>   
@@ -107,7 +106,7 @@ public:
    explicit BOOST_DLLEXPORT oserializer() :
        basic_oserializer(
            boost::serialization::singleton<
-                typename 
+                BOOST_DEDUCED_TYPENAME 
                boost::serialization::type_info_implementation< T >::type
            >::get_const_instance()
        )
@@ -206,7 +205,7 @@ template<class Archive, class T>
 pointer_oserializer<Archive, T>::pointer_oserializer() :
    basic_pointer_oserializer(
        boost::serialization::singleton<
-            typename 
+            BOOST_DEDUCED_TYPENAME 
            boost::serialization::type_info_implementation< T >::type
        >::get_const_instance()
    )
@@ -276,7 +275,7 @@ struct save_non_pointer_type {
    template<class T>
    static void invoke(Archive & ar, const T & t){
        typedef 
-            typename mpl::eval_if<
+            BOOST_DEDUCED_TYPENAME mpl::eval_if<
            // if its primitive
                mpl::equal_to<
                    boost::serialization::implementation_level< T >,
@@ -284,7 +283,7 @@ struct save_non_pointer_type {
                >,
                mpl::identity<save_primitive>,
            // else
-            typename mpl::eval_if<
+            BOOST_DEDUCED_TYPENAME mpl::eval_if<
                // class info / version
                mpl::greater_equal<
                    boost::serialization::implementation_level< T >,
@@ -293,7 +292,7 @@ struct save_non_pointer_type {
                // do standard save
                mpl::identity<save_standard>,
            // else
-            typename mpl::eval_if<
+            BOOST_DEDUCED_TYPENAME mpl::eval_if<
                    // no tracking
                mpl::equal_to<
                    boost::serialization::tracking_level< T >,
@@ -343,7 +342,7 @@ struct save_pointer_type {
        // permits abstract base classes to be used - note: exception
        // virtual serialize functions used for plug-ins
        typedef 
-            typename mpl::eval_if<
+            BOOST_DEDUCED_TYPENAME mpl::eval_if<
                boost::serialization::is_abstract< T >,
                mpl::identity<abstract>,
                mpl::identity<non_abstract>       
@@ -374,10 +373,10 @@ struct save_pointer_type {
            Archive &ar, 
            T & t
        ){
-            typename 
+            BOOST_DEDUCED_TYPENAME 
            boost::serialization::type_info_implementation< T >::type const
            & i = boost::serialization::singleton<
-                typename 
+                BOOST_DEDUCED_TYPENAME 
                boost::serialization::type_info_implementation< T >::type
            >::get_const_instance();

@@ -453,7 +452,7 @@ struct save_pointer_type {
    ){
        check_pointer_level< T >();
        check_pointer_tracking< T >();
-        typedef typename mpl::eval_if<
+        typedef BOOST_DEDUCED_TYPENAME mpl::eval_if<
            is_polymorphic< T >,
            mpl::identity<polymorphic>,
            mpl::identity<non_polymorphic>
@@ -491,7 +490,7 @@ struct save_array_type
 {
    template<class T>
    static void invoke(Archive &ar, const T &t){
-        typedef typename boost::remove_extent< T >::type value_type;
+        typedef BOOST_DEDUCED_TYPENAME boost::remove_extent< T >::type value_type;
        
        save_access::end_preamble(ar);
        // consider alignment
@@ -501,14 +500,7 @@ struct save_array_type
        );
        boost::serialization::collection_size_type count(c);
        ar << BOOST_SERIALIZATION_NVP(count);
-        // explict template arguments to pass intel C++ compiler
-        ar << serialization::make_array<
-            const value_type,
-            boost::serialization::collection_size_type
-        >(
-            static_cast<const value_type *>(&t[0]),
-            count
-        );
+        ar << serialization::make_array(static_cast<value_type const*>(&t[0]),count);
    }
 };

@@ -517,13 +509,13 @@ struct save_array_type
 template<class Archive, class T>
 inline void save(Archive & ar, /*const*/ T &t){
    typedef 
-        typename mpl::eval_if<is_pointer< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_pointer< T >,
            mpl::identity<detail::save_pointer_type<Archive> >,
        //else
-        typename mpl::eval_if<is_enum< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_enum< T >,
            mpl::identity<detail::save_enum_type<Archive> >,
        //else
-        typename mpl::eval_if<is_array< T >,
+        BOOST_DEDUCED_TYPENAME mpl::eval_if<is_array< T >,
            mpl::identity<detail::save_array_type<Archive> >,
        //else
            mpl::identity<detail::save_non_pointer_type<Archive> >
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel James	ca0202a69d	Quickbook: Merge from trunk. Includes blocks in lists fixes, and some documentation changes. [SVN r77347]	2012-03-16 08:48:10 +00:00
Daniel James	ff05ccf86d	Quickbook: Merge to quickbook-dev [SVN r76630]	2012-01-21 21:43:17 +00:00
Daniel James	8187ff3fc7	Quickbook: Copy trunk libs into quickbook-dev branch. [SVN r75213]	2011-11-01 13:04:29 +00:00
Daniel James	d765c3db9e	Quickbook: Copy trunk headers into quickbook-dev. [SVN r75212]	2011-11-01 13:03:44 +00:00
Daniel James	697a08a56c	Quickbook: New branch for development. From now on this will be my development branch. [SVN r70613]	2011-03-27 10:17:05 +00:00