Move, don't copy, the loaded value into the optional

`load_impl` read the value into a local and copy-assigned it to the optional. A move-only type then failed to compile: `optional`'s perfect-forwarding assignment is removed by SFINAE when the value is not copy-assignable, leaving no viable `operator=`. So, move the local into the optional instead. The one-line fix was proposed by Venkat Murty in PR #330; this extends it with `boost::move` and a regression test.
Run CI on merge-queue candidates
2026-07-21 13:33:32 +00:00 · 2026-07-20 09:56:46 +02:00 · 2026-07-17 18:01:05 +02:00 · 2026-07-16 17:14:08 +02:00 · 2026-07-16 17:07:58 +02:00 · 2026-07-16 16:48:39 +02:00
534 changed files with 8891 additions and 6215 deletions
@@ -0,0 +1,28 @@
+# Use, modification, and distribution are
+# subject to the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE.txt)
+#
+# Copyright Rene Rivera 2020.
+
+# For Drone CI we use the Starlark scripting language to reduce duplication.
+# As the yaml syntax for Drone CI is rather limited.
+#
+#
+globalenv={}
+linuxglobalimage="cppalliance/droneubuntu1604:1"
+windowsglobalimage="cppalliance/dronevs2019"
+
+def main(ctx):
+  return [
+  linux_cxx("TOOLSET=gcc LINK=static,shared Job 0", "g++", packages="", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'g++', 'DRONE_JOB_UUID': 'b6589fc6ab'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc LINK=static,shared Job 1", "g++", packages="g++-5", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'g++-5', 'DRONE_JOB_UUID': '356a192b79'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc LINK=static,shared Job 2", "g++", packages="g++-6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'g++-6', 'DRONE_JOB_UUID': 'da4b9237ba'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc LINK=static,shared Job 3", "g++", packages="g++-7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'g++-7', 'DRONE_JOB_UUID': '77de68daec'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang LINK=static,shared Job 4", "clang++", packages="", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'clang++', 'DRONE_JOB_UUID': '1b64538924'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang LINK=static,shared Job 5", "clang++", packages="libc++-dev", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'clang++-libc++', 'DRONE_JOB_UUID': 'ac3478d69a'}, globalenv=globalenv),
+  osx_cxx("TOOLSET=clang LINK=static,shared Job 6", "clang++", packages="", buildtype="boost", buildscript="drone", environment={'TOOLSET': 'clang', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'clang++', 'DRONE_JOB_UUID': 'c1dfd96eea'}, globalenv=globalenv),
+  osx_cxx("TOOLSET=clang LINK=static,shared Job 7", "clang++", packages="", buildtype="boost", buildscript="drone", xcode_version="10", environment={'TOOLSET': 'clang', 'LINK': 'static,shared', 'TRAVIS_COMPILER': 'clang++', 'DRONE_JOB_UUID': '902ba3cda1'}, globalenv=globalenv),
+    ]
+
+# from https://github.com/boostorg/boost-ci
+load("@boost_ci//ci/drone/:functions.star", "linux_cxx","windows_cxx","osx_cxx","freebsd_cxx")
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# Copyright 2020 Rene Rivera, Sam Darwin
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+set -e
+export TRAVIS_BUILD_DIR=$(pwd)
+export DRONE_BUILD_DIR=$(pwd)
+export TRAVIS_BRANCH=$DRONE_BRANCH
+export VCS_COMMIT_ID=$DRONE_COMMIT
+export GIT_COMMIT=$DRONE_COMMIT
+export REPO_NAME=$DRONE_REPO
+export PATH=~/.local/bin:/usr/local/bin:$PATH
+
+if [ "$DRONE_JOB_BUILDTYPE" == "boost" ]; then
+
+echo '==================================> INSTALL'
+
+BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+cd ..
+git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root
+cd boost-root
+git submodule update --init tools/build
+git submodule update --init libs/config
+git submodule update --init tools/boostdep
+cp -r $TRAVIS_BUILD_DIR/* libs/serialization
+python tools/boostdep/depinst/depinst.py serialization
+./bootstrap.sh
+./b2 headers
+
+echo '==================================> SCRIPT'
+
+echo "using $TOOLSET : : $TRAVIS_COMPILER ;" > ~/user-config.jam
+./b2 -j 3 libs/serialization/test toolset=$TOOLSET link=${LINK:-shared}
+
+fi
@@ -0,0 +1,635 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - feature/**
+  merge_group:
+
+env:
+  UBSAN_OPTIONS: print_stacktrace=1
+
+jobs:
+  posix:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolset: gcc-7
+            cxxstd: "11,14,17"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: g++-7-multilib
+            address-model: 32,64
+          - toolset: gcc-8
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: g++-8-multilib
+            address-model: 32,64
+          - toolset: gcc-9
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: g++-9-multilib
+            address-model: 32,64
+          - toolset: gcc-10
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: g++-10-multilib
+            address-model: 32,64
+          - toolset: gcc-11
+            cxxstd: "11,14,17,20"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: g++-11-multilib
+            address-model: 32,64
+          - toolset: gcc-12
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: g++-12-multilib
+            address-model: 32,64
+          - toolset: gcc-13
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: g++-13-multilib
+            address-model: 32,64
+          - toolset: gcc-14
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: g++-14-multilib
+            address-model: 32,64
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:26.04
+            os: ubuntu-latest
+            install: g++-15-multilib
+            address-model: 32,64
+          - toolset: gcc-16
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:26.04
+            os: ubuntu-latest
+            install: g++-16-multilib
+            address-model: 32,64
+          - toolset: clang
+            compiler: clang++-6.0
+            cxxstd: "11,14,17"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-6.0
+          - toolset: clang
+            compiler: clang++-7
+            cxxstd: "11,14,17"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-7
+          - toolset: clang
+            compiler: clang++-8
+            cxxstd: "11,14,17"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-8
+          - toolset: clang
+            compiler: clang++-9
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-9
+          - toolset: clang
+            compiler: clang++-10
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-10
+          - toolset: clang
+            compiler: clang++-11
+            cxxstd: "11,14,17,2a"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-11
+          - toolset: clang
+            compiler: clang++-12
+            cxxstd: "11,14,17,20"
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-12
+          - toolset: clang
+            compiler: clang++-13
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: clang-13
+          - toolset: clang
+            compiler: clang++-14
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: clang-14
+          - toolset: clang
+            compiler: clang++-15
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:22.04
+            os: ubuntu-latest
+            install: clang-15
+          - toolset: clang
+            compiler: clang++-16
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-16
+          - toolset: clang
+            compiler: clang++-17
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-17
+          - toolset: clang
+            compiler: clang++-18
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-18
+          - toolset: clang
+            compiler: clang++-19
+            cxxstd: "11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-19
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-20
+          - toolset: clang
+            compiler: clang++-21
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:26.04
+            os: ubuntu-latest
+            install: clang-21
+          - toolset: clang
+            compiler: clang++-22
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:26.04
+            os: ubuntu-latest
+            install: clang-22
+          - toolset: clang
+            cxxstd: "11,14,17,20,2b"
+            os: macos-14
+          - toolset: clang
+            cxxstd: "11,14,17,20,23,2c"
+            os: macos-15
+          - toolset: clang
+            cxxstd: "11,14,17,20,23,2c"
+            os: macos-26
+
+    runs-on: ${{matrix.os}}
+    container: ${{matrix.container}}
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - name: Setup container environment
+        if: matrix.container
+        run: |
+          apt-get update
+          apt-get -y install sudo python3 git g++ curl
+
+      - uses: actions/checkout@v6
+
+      - name: Install packages
+        if: matrix.install
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          mkdir -p libs/$LIBRARY
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python3 tools/boostdep/depinst/depinst.py -I benchmark --git_args "--jobs 3" $LIBRARY
+          ./bootstrap.sh
+          ./b2 -d0 headers
+
+      - name: Create user-config.jam
+        if: matrix.compiler
+        run: |
+          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
+
+      - name: Run tests
+        run: |
+          cd ../boost-root
+          export ADDRMD=${{matrix.address-model}}
+          ./b2 -j3 libs/$LIBRARY/test libs/$LIBRARY/example toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release
+
+  windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolset: msvc-14.3
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2022
+          - toolset: msvc-14.5
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2025-vs2026
+          - toolset: clang-win
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2025
+          - toolset: gcc
+            cxxstd: "11,14,17,2a"
+            addrmd: 64
+            os: windows-2025
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py -I benchmark --git_args "--jobs 3" %LIBRARY%
+          cmd /c bootstrap
+          b2 -d0 headers
+
+      - name: Run tests
+        shell: cmd
+        run: |
+          cd ../boost-root
+          b2 -j3 libs/%LIBRARY%/test libs/%LIBRARY%/example toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release embed-manifest-via=linker
+
+  posix-cmake-subdir:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: macos-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          mkdir -p libs/$LIBRARY
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+
+      - name: Use library with add_subdirectory
+        run: |
+          cd ../boost-root/libs/$LIBRARY/test/cmake_subdir_test
+          mkdir __build__ && cd __build__
+          cmake ..
+          cmake --build .
+          ctest --output-on-failure --no-tests=error
+
+  posix-cmake-install:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: macos-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          mkdir -p libs/$LIBRARY
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+
+      - name: Configure
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local ..
+
+      - name: Install
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install
+
+      - name: Use the installed library
+        run: |
+          cd ../boost-root/libs/$LIBRARY/test/cmake_install_test && mkdir __build__ && cd __build__
+          cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
+          cmake --build .
+          ctest --output-on-failure --no-tests=error
+
+  posix-cmake-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: macos-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Install packages
+        if: matrix.install
+        run: sudo apt-get -y install ${{matrix.install}}
+
+      - name: Setup Boost
+        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
+          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
+          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
+          cd ..
+          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          mkdir -p libs/$LIBRARY
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py -I benchmark -I example --git_args "--jobs 3" $LIBRARY
+
+      - name: Configure
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON ..
+
+      - name: Build tests
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target tests
+
+      - name: Run tests
+        run: |
+          cd ../boost-root/__build__
+          ctest --output-on-failure --no-tests=error
+
+  windows-cmake-subdir:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+
+      - name: Use library with add_subdirectory (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test
+          mkdir __build__ && cd __build__
+          cmake ..
+          cmake --build . --config Debug
+          ctest --output-on-failure --no-tests=error -C Debug
+
+      - name: Use library with add_subdirectory (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_subdir_test/__build__
+          cmake --build . --config Release
+          ctest --output-on-failure --no-tests=error -C Release
+
+  windows-cmake-install:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+
+      - name: Configure
+        shell: cmd
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+
+      - name: Install (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install --config Debug
+
+      - name: Install (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target install --config Release
+
+      - name: Use the installed library (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test && mkdir __build__ && cd __build__
+          cmake -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix ..
+          cmake --build . --config Debug
+          ctest --output-on-failure --no-tests=error -C Debug
+
+      - name: Use the installed library (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/libs/%LIBRARY%/test/cmake_install_test/__build__
+          cmake --build . --config Release
+          ctest --output-on-failure --no-tests=error -C Release
+
+  windows-cmake-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+
+    runs-on: ${{matrix.os}}
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Setup Boost
+        shell: cmd
+        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
+          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
+          set BOOST_BRANCH=develop
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
+          cd ..
+          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
+          cd boost-root
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
+          git submodule update --init tools/boostdep
+          python tools/boostdep/depinst/depinst.py -I benchmark -I example --git_args "--jobs 3" %LIBRARY%
+
+      - name: Configure
+        shell: cmd
+        run: |
+          cd ../boost-root
+          mkdir __build__ && cd __build__
+          cmake -DBOOST_INCLUDE_LIBRARIES=%LIBRARY% -DBUILD_TESTING=ON ..
+
+      - name: Build tests (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target tests --config Debug
+
+      - name: Run tests (Debug)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          ctest --output-on-failure --no-tests=error -C Debug
+
+      - name: Build tests (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          cmake --build . --target tests --config Release
+
+      - name: Run tests (Release)
+        shell: cmd
+        run: |
+          cd ../boost-root/__build__
+          ctest --output-on-failure --no-tests=error -C Release
@@ -1,4 +1,4 @@
-# Copyright 2016 Peter Dimov
+# Copyright 2016, 2017 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)

@@ -6,66 +6,97 @@ language: cpp

 sudo: false

-os:
-  - linux
-  - osx
+cache:
+  ccache: true

 branches:
  only:
    - master
    - develop
+    - /feature\/.*/
+
+env:
+  matrix:
+    - BOGUS_JOB=true
+
+matrix:
+
+  exclude:
+    - env: BOGUS_JOB=true
+
+  include:
+    - os: linux
+      compiler: g++
+      env: TOOLSET=gcc LINK=static,shared
+
+    - os: linux
+      compiler: g++-5
+      env: TOOLSET=gcc LINK=static,shared
+      addons:
+        apt:
+          packages:
+            - g++-5
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-6
+      env: TOOLSET=gcc LINK=static,shared
+      addons:
+        apt:
+          packages:
+            - g++-6
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: g++-7
+      env: TOOLSET=gcc LINK=static,shared
+      addons:
+        apt:
+          packages:
+            - g++-7
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      compiler: clang++
+      env: TOOLSET=clang LINK=static,shared
+
+    - os: linux
+      compiler: clang++-libc++
+      env: TOOLSET=clang LINK=static,shared
+      addons:
+        apt:
+          packages:
+            - libc++-dev
+
+    - os: osx
+      compiler: clang++
+      env: TOOLSET=clang LINK=static,shared
+
+    - os: osx
+      osx_image: xcode10
+      compiler: clang++
+      env: TOOLSET=clang LINK=static,shared

 install:
+  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
  - cd ..
-  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
+  - git clone -b $BOOST_BRANCH 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
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
  - cp -r $TRAVIS_BUILD_DIR/* libs/serialization
+  - python tools/boostdep/depinst/depinst.py serialization
  - ./bootstrap.sh
  - ./b2 headers

 script:
-  - TOOLSET=gcc,clang
-  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
-  - ./b2 libs/serialization/test toolset=$TOOLSET
+  - |-
+    echo "using $TOOLSET : : $TRAVIS_COMPILER ;" > ~/user-config.jam
+  - ./b2 -j 3 libs/serialization/test toolset=$TOOLSET link=${LINK:-shared}

 notifications:
  email:
@@ -1,6 +1,6 @@
 # CMake build control file for Serialization Library tests

-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 if (POLICY CMP0054)
  cmake_policy (SET CMP0054 NEW)
@@ -10,55 +10,36 @@ if (POLICY CMP0063)
  cmake_policy (SET CMP0063 NEW)
 endif (POLICY CMP0063)

-if(Boost_USE_STATIC_LIBS)
-  project("Serialization-Static")
-else()
-  project("Serialization-Shared")
-endif()
+project("serialization")

 #
 # Compiler settings
 #

-message(STATUS "compiler is ${CMAKE_CXX_COMPILER_ID}" )
+message(STATUS "C++ compiler is ${CMAKE_CXX_COMPILER_ID}" )
 add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINITIONS})
+message(STATUS "C compiler is ${CMAKE_C_COMPILER_ID}" )

 if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-  add_definitions( -ftemplate-depth=300 )
+  add_definitions( -ftemplate-depth=255 )
  # 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()
+add_definitions( -std=c++11 )
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

 #
 # Locate Project Prerequisites 
@@ -66,86 +47,35 @@ endif()

 # 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.
+# Project settings
+#
+option(BUILD_SHARED_LIBS "Build Shared Libraries" true)

-# 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.
+find_package(Boost 1.82 REQUIRED COMPONENTS system filesystem)

-# 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}")
+if(NOT Boost_FOUND)
+  message("Boost NOT Found!")
 else()
-    message(STATUS "Boost NOT Found!")
+  message(STATUS "Boost Found!")
 endif()
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(VISIBILITY_INLINES_HIDDEN YES)

-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()
+# enable usage of CHECK_INCLUDE_FILE_CXX
+include(CheckIncludeFileCXX)
+
+# list of archive names for which tests should be generated
+set(archive_list text_archive text_warchive binary_archive xml_archive xml_warchive)
+# set(archive_list xml_warchive)
+
+# list of tests generated by each function call
+set(test_list)

 ###########################
 # library builds

-add_library(serialization ${LINK_TYPE}
+add_library(serialization
  ../src/archive_exception.cpp
  ../src/basic_archive.cpp
  ../src/basic_iarchive.cpp
@@ -160,35 +90,47 @@ add_library(serialization ${LINK_TYPE}
  ../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/extended_type_info_typeid.cpp
+  ../src/extended_type_info_no_rtti.cpp
  ../src/stl_port.cpp
  ../src/text_iarchive.cpp
  ../src/text_oarchive.cpp
+  ../src/polymorphic_iarchive.cpp
+  ../src/polymorphic_oarchive.cpp
+  ../src/polymorphic_text_iarchive.cpp
+  ../src/polymorphic_text_oarchive.cpp
+  ../src/polymorphic_binary_iarchive.cpp
+  ../src/polymorphic_binary_oarchive.cpp
+  ../src/polymorphic_xml_iarchive.cpp
+  ../src/polymorphic_xml_oarchive.cpp
  ../src/void_cast.cpp
-  ../src/xml_archive_exception.cpp
+  ../src/xml_grammar.cpp
  ../src/xml_iarchive.cpp
  ../src/xml_oarchive.cpp
-  ../src/xml_grammar.cpp
+  ../src/xml_archive_exception.cpp
+  ../src/codecvt_null.cpp
  ../src/utf8_codecvt_facet.cpp
  ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
 )
+target_include_directories(serialization PUBLIC ${Boost_INCLUDE_DIR})

-add_library(wserialization  ${LINK_TYPE}
-  ../src/codecvt_null.cpp
+add_library(wserialization
  ../src/basic_text_wiprimitive.cpp
  ../src/basic_text_woprimitive.cpp
  ../src/text_wiarchive.cpp
  ../src/text_woarchive.cpp
+  ../src/polymorphic_text_wiarchive.cpp
+  ../src/polymorphic_text_woarchive.cpp
  ../src/xml_wiarchive.cpp
  ../src/xml_woarchive.cpp
+  ../src/polymorphic_xml_wiarchive.cpp
+  ../src/polymorphic_xml_woarchive.cpp
  ../src/xml_wgrammar.cpp
  ../src/basic_xml_grammar.ipp # doesn't show up in "Source Files" in Xcode"'
 )
+target_include_directories(wserialization PUBLIC ${Boost_INCLUDE_DIR})
+target_link_libraries(wserialization PUBLIC serialization)

 # end library build
 ###########################
@@ -203,61 +145,91 @@ function( serialization_test test_name)
  endforeach()
  message(STATUS ${test_name})
  add_executable( ${test_name} ../test/${test_name}.cpp ${arglist} )
-  target_link_libraries(${test_name} serialization wserialization ${Boost_LIBRARIES})
+  target_include_directories(${test_name} PUBLIC ${Boost_INCLUDE_DIR})
+  target_link_libraries(${test_name} serialization wserialization Boost::filesystem)
  add_test( ${test_name} ${test_name} )
 endfunction(serialization_test)

 function(archive_test test_name)
+  set(test_listx)
  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
+    IN ITEMS ${archive_list}
  )
    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})
+    target_include_directories(${amended_test_name} PUBLIC ${Boost_INCLUDE_DIR})
+    target_link_libraries(${amended_test_name} serialization wserialization Boost::filesystem)
    add_test(${amended_test_name} ${amended_test_name})
+    set(test_listx ${test_listx} ${amended_test_name})
  endforeach()
+  set(test_list ${test_listx} PARENT_SCOPE)
 endfunction(archive_test)

 function(polymorphic_archive_test test_name)
+  set(test_listx)
  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
+    IN ITEMS ${archive_list}
  )
-    set(amended_test_name ${test_name}_polymorphic_${archive-name})
-    message(STATUS ${amended_test_name})
+    set(amended_archive_name polymorphic_${archive-name})
+    set(amended_test_name ${test_name}_${amended_archive_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
+      PROPERTY COMPILE_DEFINITIONS BOOST_ARCHIVE_TEST=${amended_archive_name}.hpp
    )
-    target_link_libraries(${amended_test_name} serialization wserialization ${Boost_LIBRARIES})
+    message(STATUS ${amended_test_name} " " ${arglist} " " ${amended_archive_name})
+    target_include_directories(${amended_test_name} PUBLIC ${Boost_INCLUDE_DIR})
+    target_link_libraries(${amended_test_name} serialization wserialization Boost::filesystem)
    add_test(${amended_test_name} ${amended_test_name})
-  endforeach()
+    set(test_listx ${test_listx} ${amended_test_name})
+endforeach()
+set(test_list ${test_listx} PARENT_SCOPE)
 endfunction(polymorphic_archive_test)

 enable_testing()

-# serialization(test_dll_exported dll_polymorphic_derived2_lib)
-# serialization(test_dll_simple dll_a_lib)
+message(STATUS dll_a)
+add_library(dll_a SHARED ../test/dll_a.cpp)
+target_link_libraries(dll_a serialization)
+
+message(STATUS dll_polymorphic_base)
+add_library(dll_polymorphic_base SHARED ../test/dll_polymorphic_base.cpp)
+target_link_libraries(dll_polymorphic_base serialization)
+
+message(STATUS dll_polymorphic_derived2)
+add_library(dll_polymorphic_derived2 SHARED ../test/dll_polymorphic_derived2.cpp)
+target_link_libraries(dll_polymorphic_derived2 dll_polymorphic_base serialization)
+
 # 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)

+if(BUILD_SHARED_LIBS)
+  # this test can only be made to work if we're linking with shared
+  # libraries. Basically the build systems like to have all shared
+  # or all static so if we're building with static C++ libraries
+  # then linking with a shared one - we need multiple C++ libraries
+  # and things get complex.  So just run this test when we're
+  # building with shared libraries (dll in windows speak)
+  serialization_test(test_dll_simple)
+  target_link_libraries(test_dll_simple dll_a serialization)
+endif()
+
 serialization_test(test_private_ctor)
 serialization_test(test_reset_object_address A)
 serialization_test(test_void_cast)
@@ -265,15 +237,20 @@ serialization_test(test_mult_archive_types)
 serialization_test(test_iterators)
 serialization_test(test_iterators_base64)
 serialization_test(test_inclusion)
+serialization_test(test_inclusion2)
 serialization_test(test_smart_cast)
-serialization_test(test_codecvt_null ../src/codecvt_null)
+serialization_test(test_codecvt_null)
 serialization_test(test_strong_typedef)
+serialization_test(test_singleton)
+serialization_test(test_singleton_inherited)
+serialization_test(test_singleton_plain)

 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)
@@ -287,19 +264,28 @@ 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)
+CHECK_INCLUDE_FILE_CXX(forward_list FORWARD_LIST_FOUND)
+if(FORWARD_LIST_FOUND)
+  message(STATUS "forward_list header found")
+  archive_test(test_forward_list A)
+  archive_test(test_forward_list_ptrs A)
+else()
+  message(STATUS "forward_list header NOT found")
+endif()
+
 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)
+CHECK_INCLUDE_FILE_CXX(hash_map HASH_MAP_FOUND)
+if(HASH_MAP_FOUND)
+  archive_test(test_map_hashed A)
+endif()
 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)
@@ -315,11 +301,24 @@ archive_test(test_private_base2)
 archive_test(test_queue A)
 archive_test(test_recursion A)
 archive_test(test_registered)
+
+archive_test(test_set A)
+CHECK_INCLUDE_FILE_CXX(hash_set HASH_SET_FOUND)
+if(HASH_SET_FOUND)
+  archive_test(test_set_hashed A)
+endif()
+
 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)
+CHECK_INCLUDE_FILE_CXX(slist SLIST_FOUND)
+if(SLIST_FOUND)
+  message(STATUS "slist header found")
+  archive_test(test_slist A)
+  archive_test(test_slist_ptr A)
+endif()
 archive_test(test_stack A)
 archive_test(test_split)
 archive_test(test_tracking)
@@ -328,22 +327,19 @@ 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)
+
+if(BUILD_SHARED_LIBS)
+  polymorphic_archive_test(test_dll_exported polymorphic_derived1)
+  foreach(test_name IN ITEMS ${test_list} )
+    target_link_libraries(${test_name} dll_polymorphic_derived2 dll_polymorphic_base serialization wserialization)
+  endforeach()
 endif()

+polymorphic_archive_test(test_no_rtti polymorphic_base polymorphic_derived1 polymorphic_derived2)
+polymorphic_archive_test(test_exported polymorphic_base polymorphic_derived1 polymorphic_derived2)
 polymorphic_archive_test(test_polymorphic test_polymorphic_A A)
 polymorphic_archive_test(test_polymorphic2 test_polymorphic2imp)
-polymorphic_archive_test(test_polymorphic_helper)
+polymorphic_archive_test(test_p_helper)

 # end test targets
 ####################
@@ -351,7 +347,7 @@ polymorphic_archive_test(test_polymorphic_helper)
 ####################
 # add headers in IDE

-# for serialisation
+# for serialization

 file(GLOB x 
  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" 
@@ -0,0 +1,124 @@
+# Copyright 2020, 2021 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(boost_serialization VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+
+add_library(boost_serialization
+  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/codecvt_null.cpp
+  src/extended_type_info.cpp
+  src/extended_type_info_no_rtti.cpp
+  src/extended_type_info_typeid.cpp
+  src/polymorphic_binary_iarchive.cpp
+  src/polymorphic_binary_oarchive.cpp
+  src/polymorphic_iarchive.cpp
+  src/polymorphic_oarchive.cpp
+  src/polymorphic_text_iarchive.cpp
+  src/polymorphic_text_oarchive.cpp
+  src/polymorphic_xml_iarchive.cpp
+  src/polymorphic_xml_oarchive.cpp
+  src/stl_port.cpp
+  src/text_iarchive.cpp
+  src/text_oarchive.cpp
+  src/utf8_codecvt_facet.cpp
+  src/void_cast.cpp
+  src/xml_archive_exception.cpp
+  src/xml_grammar.cpp
+  src/xml_iarchive.cpp
+  src/xml_oarchive.cpp
+)
+
+add_library(boost_wserialization
+  src/basic_text_wiprimitive.cpp
+  src/basic_text_woprimitive.cpp
+  src/binary_wiarchive.cpp
+  src/binary_woarchive.cpp
+  src/polymorphic_text_wiarchive.cpp
+  src/polymorphic_text_woarchive.cpp
+  src/polymorphic_xml_wiarchive.cpp
+  src/polymorphic_xml_woarchive.cpp
+  src/text_wiarchive.cpp
+  src/text_woarchive.cpp
+  src/xml_wgrammar.cpp
+  src/xml_wiarchive.cpp
+  src/xml_woarchive.cpp
+)
+
+add_library(Boost::serialization ALIAS boost_serialization)
+add_library(Boost::wserialization ALIAS boost_wserialization)
+
+target_include_directories(boost_serialization PUBLIC include)
+target_include_directories(boost_wserialization PUBLIC include)
+
+target_link_libraries(boost_serialization
+  PUBLIC
+    Boost::array
+    Boost::assert
+    Boost::config
+    Boost::core
+    Boost::detail
+    Boost::integer
+    Boost::io
+    Boost::iterator
+    Boost::move
+    Boost::mpl
+    Boost::optional
+    Boost::predef
+    Boost::preprocessor
+    Boost::smart_ptr
+    Boost::spirit
+    Boost::type_traits
+    Boost::unordered
+    Boost::utility
+    Boost::variant
+  PRIVATE
+    Boost::function
+)
+
+target_link_libraries(boost_wserialization PUBLIC boost_serialization)
+
+target_compile_definitions(boost_serialization
+  PUBLIC BOOST_SERIALIZATION_NO_LIB
+  # Source files already define BOOST_SERIALIZATION_SOURCE
+  # PRIVATE BOOST_SERIALIZATION_SOURCE
+)
+
+target_compile_definitions(boost_wserialization
+  PUBLIC BOOST_SERIALIZATION_NO_LIB
+  # Source files already define BOOST_SERIALIZATION_SOURCE
+  # PRIVATE BOOST_SERIALIZATION_SOURCE
+)
+
+if(BUILD_SHARED_LIBS)
+  target_compile_definitions(boost_serialization PUBLIC BOOST_SERIALIZATION_DYN_LINK)
+  target_compile_definitions(boost_wserialization PUBLIC BOOST_SERIALIZATION_DYN_LINK)
+else()
+  target_compile_definitions(boost_serialization PUBLIC BOOST_SERIALIZATION_STATIC_LINK)
+  target_compile_definitions(boost_wserialization PUBLIC BOOST_SERIALIZATION_STATIC_LINK)
+endif()
+
+if(BOOST_SUPERPROJECT_VERSION AND NOT CMAKE_VERSION VERSION_LESS 3.13)
+  boost_install(TARGETS boost_serialization boost_wserialization VERSION ${BOOST_SUPERPROJECT_VERSION} HEADER_DIRECTORY include)
+endif()
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
@@ -0,0 +1,82 @@
+# Copyright 2016 Peter Dimov
+# Copyright 2016 Robert Ramey
+# 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)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - develop
+#    - master
+
+environment:
+  matrix:
+    - BUILD_TOOLSET: gcc
+      BUILD_LINK: static
+    - BUILD_TOOLSET: gcc
+      BUILD_LINK: shared
+    - BUILD_TOOLSET: msvc-14.0
+      BUILD_LINK: static
+    - BUILD_TOOLSET: msvc-14.0
+      BUILD_LINK: shared
+
+install:
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH%  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/container_hash
+  - 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/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 libs/winapi
+  - git submodule init tools/boost_install
+  - git submodule init libs/headers
+
+  - git submodule init tools/build
+  - git submodule update
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\serialization
+  - set PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%CD%;%PATH%
+  - bootstrap gcc
+  - b2 headers
+
+build: off
+
+test_script:
+  - cd libs/serialization/test
+  - b2 -j2 toolset=%BUILD_TOOLSET% link=%BUILD_LINK%
@@ -0,0 +1,45 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/array//boost_array
+    /boost/assert//boost_assert
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/detail//boost_detail
+    /boost/integer//boost_integer
+    /boost/io//boost_io
+    /boost/iterator//boost_iterator
+    /boost/move//boost_move
+    /boost/mp11//boost_mp11
+    /boost/mpl//boost_mpl
+    /boost/optional//boost_optional
+    /boost/predef//boost_predef
+    /boost/preprocessor//boost_preprocessor
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/spirit//boost_spirit
+    /boost/throw_exception//boost_throw_exception
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility
+    /boost/variant//boost_variant
+    /boost/variant2//boost_variant2 ;
+
+project /boost/serialization
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_serialization : build//boost_serialization ]
+    [ alias boost_wserialization : build//boost_wserialization ]
+    [ alias all : boost_serialization boost_wserialization example test ]
+    ;
+
+call-if : boost-library serialization
+    : install boost_serialization boost_wserialization
+    ;
+
@@ -1,15 +1,27 @@
 # Boost serialization Library Build Jamfile
 #  (C) Copyright Robert Ramey 2002-2004.
-#  Use, modification, and distribution are subject to the 
-#  Boost Software License, Version 1.0. (See accompanying file 
+#  Use, modification, and distribution are 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/libs/serialization for the library home page.

-project boost/serialization
+require-b2 5.0.1 ;
+import-search /boost/config/checks ;
+import config : requires ;
+
+constant boost_dependencies_private :
+    /boost/function//boost_function
+    ;
+
+project
    : source-location ../src
+    : common-requirements <library>$(boost_dependencies)
    : requirements
      <conditional>@include-spirit
+      <library>$(boost_dependencies_private)
+    : usage-requirements
+        <define>BOOST_SERIALIZATION_NO_LIB=1
 ;

 SPIRIT_ROOT = [ modules.peek : SPIRIT_ROOT ] ;
@@ -18,41 +30,42 @@ rule include-spirit ( properties * )
    local old-compiler ;
    if <toolset>borland in $(properties)
    {
-        if ! <toolset-borland:version>6.1.0 in $(properties)  
-        {  
-            old-compiler = true ;  
-        }  
+        if ! <toolset-borland:version>6.1.0 in $(properties)
+        {
+            old-compiler = true ;
+        }

    }
    else if <toolset>msvc in $(properties)
    {
        if <toolset-msvc:version>6.5 in $(properties)
          || <toolset-msvc:version>7.0 in $(properties)
-        {            
+        {
            old-compiler = true ;
-        }        
+        }
    }
-        
+
    local result ;
    if $(old-compiler)
-    {        
+    {
        if $(SPIRIT_ROOT)
        {
-            # note - we can't use <include>$(SPIRIT_ROOT) because 
+            # note - we can't use <include>$(SPIRIT_ROOT) because
            # it puts -I$(SPIRIT_ROOT) AFTER the "../../.." in the command line.
-            # so use these instead 
+            # so use these instead
            result = <cxxflags>-I$(SPIRIT_ROOT) ;
        }
-        else 
+        else
        {
            echo **** spirit 1.6x required to build library with this compiler **** ;
            result = <build>no ;
        }
-    }    
+    }
    return $(result) ;
 }

-SOURCES = 
+SOURCES =
+    archive_exception
    basic_archive
    basic_iarchive
    basic_iserializer
@@ -74,55 +87,58 @@ SOURCES =
    stl_port
    text_iarchive
    text_oarchive
+    polymorphic_text_iarchive
+    polymorphic_text_oarchive
+    polymorphic_binary_iarchive
+    polymorphic_binary_oarchive
+    polymorphic_xml_iarchive
+    polymorphic_xml_oarchive
    void_cast
-    archive_exception
    xml_grammar
    xml_iarchive
-    xml_oarchive
    xml_archive_exception
    codecvt_null
+ ;
+
+SOURCES_HAS_STD_WSTREAMBUF =
+    xml_oarchive
    utf8_codecvt_facet
-    singleton
 ;
-    
-WSOURCES = 
+
+WSOURCES =
    basic_text_wiprimitive
    basic_text_woprimitive
    text_wiarchive
    text_woarchive
+    polymorphic_text_wiarchive
+    polymorphic_text_woarchive
    xml_wgrammar
    xml_wiarchive
    xml_woarchive
+    polymorphic_xml_wiarchive
+    polymorphic_xml_woarchive
+    codecvt_null
 ;

-lib boost_serialization 
-    : $(SOURCES).cpp
-    : 
+lib boost_serialization
+    : ## sources ##
+     $(SOURCES).cpp
+    : ## requirements ##
+    [ check-target-builds /boost/config/checks//std_wstreambuf : <source>../src/$(SOURCES_HAS_STD_WSTREAMBUF).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>msvc:<define>_CRT_SECURE_NO_WARNINGS
    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
    ;

-lib boost_wserialization 
-    : $(WSOURCES).cpp boost_serialization 
-    :     
-    <toolset>msvc:<cxxflags>/Gy 
+lib boost_wserialization
+    : $(WSOURCES).cpp boost_serialization
+    :
+    [ requires std_wstreambuf ]
+    <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>msvc:<define>_CRT_SECURE_NO_WARNINGS
    # note: both serialization and wserialization are conditioned on the this
    # switch - don't change it to BOOST_WSERIALIZATION_DYN_LINK
    <link>shared:<define>BOOST_SERIALIZATION_DYN_LINK=1
    ;
-
-boost-install boost_serialization boost_wserialization ;
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -53,7 +53,7 @@ http://www.boost.org/LICENSE_1_0.txt)
  <a href="http://www.boost.org/people/beman_dawes.html">Beman Dawes</a> who got the boost
  serialization ball rolling.  It was one or both of these two that invented
  the much beloved <code>&amp;</code> syntax used to implement both save and
-  load in one fuction specification.
+  load in one function specification.
  <li><a href="http://www.boost.org/people/vladimir_prus.htm">Vladimir Prus</a> for evaluating an
  early draft and contributing the diamond inheritance example.
  <li><a href="http://www.boost.org/people/william_kempf.htm">William E. Kempf</a>
@@ -2,8 +2,8 @@
 <html>
 <!--
 (C) Copyright 2002-10 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
+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)
 -->
 <head>
@@ -41,7 +41,7 @@ class must implement in order to be used to serialize
 Our discussion will focus on archives used for saving as the hierarchy is exactly analogous
 for archives used for loading data.

-<h4>Minimum Requirments</h4>
+<h4>Minimum Requirements</h4>

 The simplest class which will model the <a href="archives.html"><strong>Archive</strong></a> concept specifies the functions that a
 class will look like:
@@ -58,10 +58,10 @@ public:
    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; trivial_oarchive & operator&lt;&lt;(const T & t){
+    template&lt;class T&gt; trivial_oarchive &amp; operator&lt;&lt;(const T &amp; t){
        return *this;
    }
-    template&lt;class T&gt; trivial_oarchive & operator&(const T & t){
+    template&lt;class T&gt; trivial_oarchive &amp; operator&amp;(const T &amp; t){
        return *this &lt;&lt; t;
    }
    void save_binary(void *address, std::size_t count){};
@@ -172,21 +172,16 @@ to be optimised away for archive classes that don't use it.
 <p>
 <dt><h4><code>
 template&lt;class T&gt;
-void save_override(T & t, int);
+void save_override(T &amp; t, int);
 </code></h4></dt>
 <dd>
-<strong>Default</strong>:Invokes <code style="white-space: normal">archive::save(Archive & ar, t)</code><br>
+<strong>Default</strong>:Invokes <code style="white-space: normal">archive::save(Archive &amp; ar, t)</code><br>
 This is the main entry into the serialization library.<br>
 <strong>Purpose</strong>:This can be specialized in cases where the data is to be written 
 to the archive in some special way.  For example, XML archives implement special handling for
 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.
-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>.
 </dd>

 </dl>
@@ -195,7 +190,7 @@ implement partial function template ordering.  For more information see
 The serialization library injects bookkeeping data into the serialization archive.
 This data includes things like object ids, version numbers, class names etc.  Each
 of these objects is included in a wrapper so that the archive class can override the
-implementation of <code style="white-space: normal">void save_override(T & t, int);</code>.
+implementation of <code style="white-space: normal">void save_override(T &amp; t, int);</code>.
 For example, in the XML archive, the override for this type renders an object_id equal to 23 as
 "object_id=_23".  The following table lists the types defined in the 
 <code style="white-space: normal">boost::archive namespace</code>
@@ -231,11 +226,6 @@ explicitly provided for these types. For an example see
 In real practice, we probably won't be quite done. 
 One or more of the following issues may need to be addressed:
 <ul>
-    <li>Many compilers fail to implement correct partial ordering of
-    function templates.  The archives included with this library work around
-    this using argument overloading.  This technique is described in
-    <a target="detail" href="implementation.html#functiontemplateordering">
-    another section of this manual</a>
    <li>Even if we are using a conforming compiler, we might want our new archive class
    to be portable to non-conforming compilers.
    <li>Our archive format might require extra information inserted into it.  For
@@ -260,14 +250,14 @@ EXCEPT for one special case.
 <ul>
    <li>Instances of a derived class are serialized through a base class pointer.
    <li>Such instances are not "registered" neither implicitly nor explicitly. That
-    is, the macro <code style="white-space: normal">BOOT_CLASS_EXPORT</code> is used 
+    is, the macro <code style="white-space: normal">BOOST_CLASS_EXPORT</code> is used 
    to instantiate the serialization code for the included archives.
 </ul>

 To make this work, the following should be included after the archive
 class definition.
 <pre><code>
-#define BOOST_SERIALIZATION_REGISTER_ARCHIVE(Archive)
+BOOST_SERIALIZATION_REGISTER_ARCHIVE(Archive)
 </code></pre>
 Failure to do this will not inhibit the program from compiling, linking
 and executing properly - except in one case.  If an instance of a derived
@@ -281,7 +271,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 that don't support wide character i/o). 
 <p>
 In addition, there are 28 other tests which aren't related to any particular archive class.
 <p>
@@ -333,7 +323,7 @@ library_test --toolset=gcc -sBOOST_ARCHIVE_LIST=portable_binary_archive.hpp

 All archives described so far are implemented as templates.  Code to save and load
 data to archives is regenerated for each combination of archive class and data type.
-Under these cirumstances, a good optimizing compiler that can expand 
+Under these circumstances, a good optimizing compiler that can expand 
 <code>inline</code> functions to enough depth will generate fast code.  
 However:
 <ul>
@@ -410,7 +400,7 @@ 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
+Note that the concept of polymorphic archives is fundamentally incompatible with the
 serialization of new types that are marked "primitive" by the user with:
 <pre><code> 
 BOOST_CLASS_IMPLEMENTATION(my_primitive_type, boost::serialization::primitive_type)
@@ -418,7 +408,7 @@ BOOST_CLASS_IMPLEMENTATION(my_primitive_type, boost::serialization::primitive_ty

 Code to implement serialization for these types is instantiated "on the fly" in the user's program.
 But this conflicts with the whole purpose of the polymorphic archive. An attempt to
-serialize such a primitive type will result in a compilation error since the common polymorhic
+serialize such a primitive type will result in a compilation error since the common polymorphic
 interface is static and cannot instantiate code for a new type.

 <p>
@@ -232,7 +232,7 @@ equivalent to the original.

 There are archives based on text, binary and XML file
 formats but all have the above interface.  Given that all archives present
-the same public interface, specifcation of serialization is exactly the same
+the same public interface, specification of serialization is exactly the same
 for all archives.  Archive classes have other members not mentioned here.
 However they are related to the internal functioning of the library and
 are not meant to be called by users of an archive.  Implementation of new
@@ -292,7 +292,7 @@ included in the code module containing the serialization code.

 </code></pre>

-All of these archives implement the same inteface. Hence, it should suffice to describe only one
+All of these archives implement the same interface. Hence, it should suffice to describe only one
 of them in detail.  For this purpose we will use the text archive.


@@ -303,7 +303,7 @@ namespace archive {
 enum archive_flags {
    no_header = 1,          // suppress archive header info
    no_codecvt = 2,         // suppress alteration of codecvt facet
-    no_xml_tag_checking = 4 // suppress checking of xml tags - igored on saving
+    no_xml_tag_checking = 4 // suppress checking of xml tags - ignored on saving
 };

 } // archive
@@ -319,7 +319,7 @@ class text_oarchive : ...
    ...
 public:
    ... // implementation of the <strong>Saving Archive</strong> concept
-    text_oarchive(std::ostream & os, unsigned int flags = 0);
+    text_oarchive(std::ostream &amp; os, unsigned int flags = 0);
    ~text_oarchive();
 };

@@ -330,7 +330,7 @@ public:
 <dl>

 <dt><h4><code>
-text_oarchive(std::ostream & os, unsigned int flags = 0);
+text_oarchive(std::ostream &amp; os, unsigned int flags = 0);
 </code></h4></dt>
 <dd>
 Constructs an archive given an open <code style="white-space: normal">stream</code> as 
@@ -343,7 +343,7 @@ output with initial data which helps identify them as archives produced by this
 This permits a more graceful handling of the case where an attempt is made to load an archive
 from an invalid file format. In addition to this, each type of archive might have 
 its own information.  For example, native binary archives include information about 
-sizes of native types and endianess to gracefully handle the case where it has been
+sizes of native types and endianness to gracefully handle the case where it has been
 erroneously assumed that such an archive is portable across platforms.  In some cases, 
 where this extra overhead might be considered objectionable, it can be suppressed with the
 <code style="white-space: normal">no_header</code> flag.
@@ -379,7 +379,7 @@ class text_iarchive : ...
    ...
 public:
    ... // implementation of the <strong>Loading Archive</strong> concept
-    text_iarchive(std::istream & is, unsigned int flags = 0);
+    text_iarchive(std::istream &amp; is, unsigned int flags = 0);
    ~text_iarchive();
 };

@@ -391,10 +391,10 @@ public:
 <dl>

 <dt><h4><code>
-text_iarchive(std::istream & is, unsigned int flags = 0);
+text_iarchive(std::istream &amp; is, unsigned int flags = 0);
 </code></h4></dt>
 <dd>
-Contructs an archive given an open <code style="white-space: normal">stream</code> as 
+Constructs an archive given an open <code style="white-space: normal">stream</code> as 
 an argument and optional flags. If flags are used, they should be the same
 as those used when the archive was created. Function and usage of flags is described
 above.
@@ -418,11 +418,11 @@ to the common class interface described above, they include the following
 constructors:
 <dl>
 <dt><h4><code>
-binary_oarchive(std::streambuf & bsb, unsigned int flags = 0);
+binary_oarchive(std::streambuf &amp; bsb, unsigned int flags = 0);
 </code></h4></dt>
 and
 <dt><h4><code>
-binary_iarchive(std::streambuf & bsb, unsigned int flags = 0);
+binary_iarchive(std::streambuf &amp; bsb, unsigned int flags = 0);
 </code></h4></dt>
 </dl>

@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -42,7 +42,7 @@ http://www.boost.org/LICENSE_1_0.txt)
    <a name="5"></a>
    <li>Scott Meyers, <u>Effective C++</u>, Addison-Wesley, 1992
    <a name="6"></a>
-    <li>Bjarne Stroustrup, <u>The C++ Programming Langage</u>, Addison-Wesley, 1997
+    <li>Bjarne Stroustrup, <u>The C++ Programming Language</u>, Addison-Wesley, 1997
    <a name="7"></a>
    <li>Alexandrescu, Andrei, <u>Modern C++ Design</u>, Addison-Wesley, 2001
    <a name="8"></a>
@@ -1,8 +1,8 @@
 <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <!--
 (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
+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)
 -->
 <html>
@@ -29,49 +29,49 @@ http://www.boost.org/LICENSE_1_0.txt)
 <pre><code>


-basic_oarchive <a href="../../../boost/archive/detail/basic_oarchive.hpp">-></a>
+basic_oarchive <a href="../../../boost/archive/detail/basic_oarchive.hpp">-&gt;</a>
      |
      |
-      |      interface_oarchive&lt;text_oarchive&gt; <a href="../../../boost/archive/detail/interface_oarchive.hpp">-></a>
+      |      interface_oarchive&lt;text_oarchive&gt; <a href="../../../boost/archive/detail/interface_oarchive.hpp">-&gt;</a>
      |                     /
      |                   /
      |        _________/
      |      /
      |    /
      |  /
-common_oarchive&lt;text_oarchive&gt; <a href="../../../boost/archive/detail/common_oarchive.hpp">-></a>
+common_oarchive&lt;text_oarchive&gt; <a href="../../../boost/archive/detail/common_oarchive.hpp">-&gt;</a>
      |
      |
-<font color="blue">basic_text_oarchive&lt;text_oarchive&gt;</font> <a href="../../../boost/archive/basic_text_oarchive.hpp">-></a>
+<font color="blue">basic_text_oarchive&lt;text_oarchive&gt;</font> <a href="../../../boost/archive/basic_text_oarchive.hpp">-&gt;</a>
      |
      |
-      |     <font color="blue">basic_text_oprimitive&lt;basic_ostream&gt;</font> <a href="../../../boost/archive/basic_text_oprimitive.hpp">-></a>
+      |     <font color="blue">basic_text_oprimitive&lt;basic_ostream&gt;</font> <a href="../../../boost/archive/basic_text_oprimitive.hpp">-&gt;</a>
      |                    /
      |                  /
-      |       _________/                  interface_oarchive&lt;polymorphic_oarchive&gt; <a href="../../../boost/archive/detail/interface_oarchive.hpp">-></a>
+      |       _________/                  interface_oarchive&lt;polymorphic_oarchive&gt; <a href="../../../boost/archive/detail/interface_oarchive.hpp">-&gt;</a>
      |     /                                                |
      |   /                                                  |
      | /                                                    |
-<font color="blue">text_oarchive_impl&lt;text_oarchive&gt;</font> <a href="../../../boost/archive/text_oarchive.hpp">-></a>              polymorphic_oarchive_impl <a href="../../../boost/archive/polymorphic_oarchive.hpp">-></a>
+<font color="blue">text_oarchive_impl&lt;text_oarchive&gt;</font> <a href="../../../boost/archive/text_oarchive.hpp">-&gt;</a>              polymorphic_oarchive_impl <a href="../../../boost/archive/polymorphic_oarchive.hpp">-&gt;</a>
      | \                                                    |
      |   \                                                  |
-      |     \_____________________________________    <font color="red">polymorphic_oarchive</font> <a href="../../../boost/archive/polymorphic_oarchive.hpp">-></a>
+      |     \_____________________________________    <font color="red">polymorphic_oarchive</font> <a href="../../../boost/archive/polymorphic_oarchive.hpp">-&gt;</a>
      |                                           \         /
      |                                             \     /
      |                                               \ /  
-<font color="red">text_oarchive</font> <a href="../../../boost/archive/text_oarchive.hpp">-></a>                 polymorphic_oarchive_route&lt;text_oarchive_impl&lt;text_oarchive&gt; &gt; <a href="../../../boost/archive/detail/polymorphic_oarchive_route.hpp">-></a>
+<font color="red">text_oarchive</font> <a href="../../../boost/archive/text_oarchive.hpp">-&gt;</a>                 polymorphic_oarchive_route&lt;text_oarchive_impl&lt;text_oarchive&gt; &gt; <a href="../../../boost/archive/detail/polymorphic_oarchive_route.hpp">-&gt;</a>
                                                       |
                                                       |
                                                       |
-                                             <font color="red">polymorphic_text_oarchive</font> <a href="../../../boost/archive/polymorphic_text_oarchive.hpp">-></a>
+                                             <font color="red">polymorphic_text_oarchive</font> <a href="../../../boost/archive/polymorphic_text_oarchive.hpp">-&gt;</a>


 </code></pre>
 This diagram shows the relationship between the various classes that implement saving (output
-serialization) for text archives.  The hierachy and organization is similar for loading and for
+serialization) for text archives.  The hierarchy and organization is similar for loading and for
 other types of archives as well.  In the diagram, classes written in <font color="blue">blue</font> 
-implement saving for a given archive type. (in this case its text archives).
-Users include classes in <font color="red">red</font> to save their data from a partcular
+implement saving for a given archive type. (in this case it's text archives).
+Users include classes in <font color="red">red</font> to save their data from a particular
 type of archive.  Other classes whose names are in black implement the library and should
 never change.  They are in <code>namespace boost::archive::detail</code>
 <dl>
@@ -141,7 +141,7 @@ never change.  They are in <code>namespace boost::archive::detail</code>
  <a href="../../../boost/archive/polymorphic_oarchive.hpp">polymorphic_oarchive</a>
  </code></dt>
  <dd>
-  A class with a list of virtual <code style="white-space: normal">save(T &t)</code>
+  A class with a list of virtual <code style="white-space: normal">save(T &amp;t)</code>
  for all primitive types T. This is the class that is used to do pre-compile serialization of classes
  for all archives present and future.
  
@@ -157,8 +157,8 @@ never change.  They are in <code>namespace boost::archive::detail</code>
  <a href="../../../boost/archive/polymorphic_text_oarchive.hpp">polymorphic_text_oarchive</a>
  </code></dt>
  <dd>
-  this is just a typedef so we can write polymorphic_text_archive rather than
-  <code style="white-space: normal">polymorphic_oarchive_route&lt;text_oarchive_impl&'t;text_oarchive&gt; &gt;</code>
+  this is just a typedef so we can write <code style="white-space: normal">polymorphic_text_archive</code> rather than
+  <code style="white-space: normal">polymorphic_oarchive_route&lt;text_oarchive_impl&lt;text_oarchive&gt; &gt;</code>
  
 </dl>
 <hr>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -101,7 +101,10 @@ function initialize() {

    <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#stl">STL Collections</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#versioning">Class Versioning</a>
-    <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#splitting">Splitting <code>serialize</code> into <code>save/load</code></a>
+    <dt><img style="display:none" src="dot.gif">
+        <a target="detail" href="tutorial.html#splitting">
+            Splitting <code>serialize</code> into <code>save/load</code>
+        </a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#archives">Archives</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#examples">List of Examples</a>
  </dl></div></dd>
@@ -133,7 +136,9 @@ function initialize() {
          <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#templates">Templates</a>
        </dl></div></dd>
        <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#versioning">Versioning</a>
-        <dt><img style="display:none" s'c="dot.gif"><a target="detail" href="serialization.html#splitting">Splitting <code>serialize</code> into <code>save/load</code></a>
+        <dt><img style="display:none" src="dot.gif"><a target="detail" href="tutorial.html#splitting">
+                Splitting <code>serialize</code> into <code>save/load</code>
+            </a>
      </dl></div></dd>
      <dt><img style="display:none" src="plus.gif" id="pointers"><a target="detail" href="serialization.html#pointeroperators">Pointers</a>
      <dd><div id="pointers_detail"><dl class="page-index">
@@ -181,7 +186,7 @@ function initialize() {
      </dl></div></dd>
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="serialization.html#models">Models - Serialization Implementations Included in the Library</a>
    </dl></div></dd>
-    <dt><img style="display:none" src="plus.gif" id="special"><a target="detail" 'ref="special.html">Special Considerations</a>
+    <dt><img style="display:none" src="plus.gif" id="special"><a target="detail" href="special.html">Special Considerations</a>
    <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>
@@ -198,7 +203,7 @@ function initialize() {
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#dlls">DLLS - Serialization and Runtime Linking</a>
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#plugins">Plugins</a>
      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#multi_threading">Multi-Threading</a>
-      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#optimizations">Optimzations</a>
+      <dt><img style="display:none" src="dot.gif"><a target="detail" href="special.html#optimizations">Optimizations</a>
      <dt><img style="display:none" src="plus.gif" id="exceptions"><a target="detail" href="exceptions.html">Archive Exceptions</a>
      <dd><div id="exceptions_detail"><dl class="page-index">
        <dt><img style="display:none" src="dot.gif"><a target="detail" href="exceptions.html#unregistered_class"><code>unregistered_class</code></a>
@@ -227,7 +232,6 @@ function initialize() {
  </dl></div></dd>
  <dt><img style="display:none" src="plus.gif" id="implementation"><a target="detail" href="implementation.html">Implementation Notes</a>
  <dd><div id="implementation_detail"><dl class="page-index">
-    <dt><img style="display:none" src="dot.gif"><a target="detail" href="implementation.html#functiontemplateordering">Partial Function Template Ordering</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="implementation.html#charencoding">Character Encoding</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="implementation.html#tempatesyntax">Template Invocation syntax</a>
    <dt><img style="display:none" src="dot.gif"><a target="detail" href="implementation.html#partialtemplatespecialization">Partial Template Specialization</a>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -112,20 +112,6 @@ constructor <code style="white-space: normal">base64_text(const char *)</code>
 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
 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" 
-the above example is modified to:
-<pre><code>
-std::copy(
-    base64_text(BOOST_MAKE_PFTO_WRAPPER(address)),
-    base64_text(BOOST_MAKE_PFTO_WRAPPER(address + count)),
-    ostream_iterator&lt;char&gt;(os)
-);
-</code></pre>
-This macro is defined in <a target="pfto" href="../../../boost/serialization/pfto.hpp">&lt;boost/serialization/pfto.hpp&gt;</a>.
-For more information about this topic, check the source.

 <h4>Dereferencing</h4>
 Dereferencing some iterators can cause problems.  For example, a natural
@@ -149,7 +135,7 @@ Iterators which fulfill the above requirements should be composable and the abov
 code should implement our binary to base64 conversion.

 <h3>Iterators Included in the Library</h3>
-Dataflow iterators for the serialization library are all defined in the hamespace
+Dataflow iterators for the serialization library are all defined in the namespace
 <code style="white-space: normal">boost::archive::iterators</code> included here are:
 <dl class="index">
  <dt><a target="base64_from_binary" href="../../../boost/archive/iterators/base64_from_binary.hpp">
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -83,12 +83,6 @@ 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
-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 several places, including the archive classes themselves.
    <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
@@ -105,7 +99,7 @@ that the following equivalent works on more compilers.
 <pre><code>
    // default fall through for any types not specified here
    template&lt;class T&gt;
-    void save(const T & t){
+    void save(const T &amp; t){
        xml_oarchive_impl&lt;derived_t&gt;::save(t);
    }
    void save(const unsigned int t);
@@ -133,14 +127,14 @@ class log_archive_impl :
    public xml_oarchive_impl&lt;Archive&gt;
 {
    ...
-);
+};

 // do not derive from this class !!!
 class log_archive : 
    public log_archive_impl&lt;log_archive&gt;
 {
 public:
-    log_archive(std::ostream & os, unsigned int flags = 0) :
+    log_archive(std::ostream &amp; os, unsigned int flags = 0) :
        log_archive_impl&lt;xml_oarchive&gt;(os, flags)
    {}
 };
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -78,7 +78,7 @@ 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 proggram
+                            // one used by the program.  This indicates that the program
                            // needs to be rebuilt.
        multiple_code_instantiation, // code for implementing serialization for some
                            // type has been instantiated in more than one module.
@@ -141,23 +141,23 @@ exception will be thrown.
 To understand what this exception means consider the following scenario
 <pre><code>
 template&lt;class Archive&gt;
-void T::save(Archive &ar) const
+void T::save(Archive &amp;ar) const
 {
-    const A * aptr = &a;
-    ar << aptr;          // save an instance of object of class A through a pointer
+    const A * aptr = &amp;a;
+    ar &lt;&lt; aptr;          // save an instance of object of class A through a pointer
    ...
-    ar << a;             // save an instance of an object of class A
-    assert(aptr == &a);  // this must be true
+    ar &lt;&lt; a;             // save an instance of an object of class A
+    assert(aptr == &amp;a);  // this must be true
 }

 template&lt;class Archive&gt;
-void T::load(Archive &ar)
+void T::load(Archive &amp;ar)
 {
    A * aptr;
-    ar >> aptr;          // create and initialize a new instance of class A
+    ar &gt;&gt; aptr;          // create and initialize a new instance of class A
    ...
-    ar >> a;             // restore state of on object of class A
-    assert(aptr == &a);  // this won't be true
+    ar &gt;&gt; a;             // restore state of on object of class A
+    assert(aptr == &amp;a);  // this won't be true
 }
 </pre></code>
 An object is saved first through a pointer then directly.  Upon loading back
@@ -184,7 +184,7 @@ archive has already been created.
 <br>
 <a name="output_stream_error"><code style="white-space: normal">output_stream_error</code></a>
 </h3>
-An error has occured during stream input or ouput.  Aside from the common 
+An error has occurred during stream input or ouput.  Aside from the common 
 situations such as a corrupted or truncated input file, there are 
 several less obvious ones that sometimes occur.
 <p>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -49,7 +49,7 @@ the following functions
    The main function we require - <code style="white-space: normal">std::typeid()</code>
    is not available in all environments. Support for this function depends upon
    runtime typing(RTTI) support from the compiler.  This may be non-existent
-    or not enabled for reasons such as a percieved inefficiency.
+    or not enabled for reasons such as a perceived inefficiency.
  <li>
    <code style="white-space: normal">std::type_info</code> includes a string
    containing type name.  This would seem to satisfy 2) above.
@@ -95,7 +95,7 @@ corresponding type can be found.  This facility is used by the serialization lib
 in order to construct types serialized through a base class pointer.

 <h3><a name="runtime">Runtime Interface</a></h3>
-<pre><code">
+<pre><code>
 namespace boost { 
 namespace serialization {

@@ -114,9 +114,9 @@ protected:
    void key_unregister();
 public:
    const char * get_key() const;
-    bool operator<(const extended_type_info &rhs) const;
-    bool operator==(const extended_type_info &rhs) const;
-    bool operator!=(const extended_type_info &rhs) const {
+    bool operator&lt;(const extended_type_info &amp;rhs) const;
+    bool operator==(const extended_type_info &amp;rhs) const;
+    bool operator!=(const extended_type_info &amp;rhs) const {
        return !(operator==(rhs));
    }
    // for plugins
@@ -133,7 +133,7 @@ Generally, there will be one and only one
 <code style="white-space: normal"><a target="extended_type_info.hpp" href = "../../../boost/serialization/extended_type_info.hpp">extended_type_info</a></code>
 instance created for each type.  However, this is enforced only at the executable
 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.
+there may be more than one instance of this class corresponding 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 
 the instances contain.
@@ -188,9 +188,9 @@ instance.  If no key has been associated with the instance, then a NULL is retur
 </dd>

 <dt><h4><pre><code>
-bool operator<(const extended_type_info & rhs) const;
-bool operator==(const extended_type_info & rhs) const;
-bool operator!=(const extended_type_info & rhs) const;
+bool operator<(const extended_type_info &amp; rhs) const;
+bool operator==(const extended_type_info &amp; rhs) const;
+bool operator!=(const extended_type_info &amp; rhs) const;
 </code></pre></h4></dt>
 <dd>
 These functions are used to compare
@@ -261,7 +261,7 @@ and also implement the following:
 <dt><h4><code style="white-space: normal"><pre>
 template&lt;class ETI&gt;
 const extended_type_info *
-ETI::get_derived_extended_type_info(const T & t) const;
+ETI::get_derived_extended_type_info(const T &amp; t) const;
 </pre></code></h4></dt>
 <dd>
 Return a pointer to the 
@@ -275,7 +275,7 @@ with a particular <code style="white-space: normal">extended_type_info</code> im
 </dd>

 <dt><h4><code style="white-space: normal"><pre>
-virtual bool ETI::is_less_than(const extended_type_info &rhs) const;
+virtual bool ETI::is_less_than(const extended_type_info &amp;rhs) const;
 </pre></code></h4></dt>
 <dd>
 Compare this instance to another one using the same
@@ -283,7 +283,7 @@ Compare this instance to another one using the same
 </dd>

 <dt><h4><code style="white-space: normal"><pre>
-virtual bool ETI::is_equal(const extended_type_info &rhs) const;
+virtual bool ETI::is_equal(const extended_type_info &amp;rhs) const;
 </pre></code></h4></dt>
 <dd>
 Compare this instance to another one using the same
@@ -330,7 +330,7 @@ by the compiler.
 <code style="white-space: normal"><h4><a target="extended_type_info_no_rtti.hpp" href="../../../boost/serialization/extended_type_info_no_rtti.hpp">
 extended_type_info_no_rtti</a></h4></code>
 is implemented in a way that doesn't rely on the existence RTTI.
-Instead, it requires that all polymorphic types be explictly exported.
+Instead, it requires that all polymorphic types be explicitly exported.
 In addition, if the export facility is to be used to serialize types
 through base class pointers, those types are required to implement
 a virtual function with the signature:
@@ -354,16 +354,16 @@ inter-operability between two different implementations of
 <h3><a name="type_requirements">Requirements for Each Type</a></h3>
 Each type to be managed by the system must be
 "registered" individually. This is accomplished by instantiating
-templates.  For example, if the type T is to use the type_info system
+templates.  For example, if the type T is to use the <code style="white-space: normal">type_info</code> system
 one would include the following code:

 <code style="white-space: normal"><pre>
 namespace boost {
 namespace serialization {
 template
-struct extended_type_info_typeid&gt;T&gt;;
+struct extended_type_info_typeid&lt;T&gt;;
 template
-struct extended_type_info_typeid&gt;const T&gt;;
+struct extended_type_info_typeid&lt;const T&gt;;
 } // serialization
 } // boost
 </pre></code>
@@ -375,7 +375,7 @@ the macro:
 <code style="white-space: normal"><pre>
 BOOST_CLASS_TYPE_INFO(
    my_type, 
-    extended_type_info_typeid&gt;my_class&gt;
+    extended_type_info_typeid&lt;my_class&gt;
 )
 </pre></code>

@@ -399,7 +399,7 @@ struct derived : public base {
 };
 ...
 extended_type_info *eti = extended_type_info::find("my_class")
-base * b = eti->construct(...);
+base * b = eti-&gt;construct(...);
 </pre></code>
 <br>
 The <code>construct</code> takes an argument count and up to
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -58,7 +58,7 @@ is included with the following declaration
 <a name="userincludes">
 <h3>Files Included by User Programs</h3>
 Using this library entails including headers listed in this section.
-It should not be necessary to explictly include any other header files.
+It should not be necessary to explicitly include any other header files.

 <a name="archiveimplementations">
 <h4>Archive Implementations</h4>
@@ -185,7 +185,7 @@ boost/serialization/version.hpp
 <dt><a target="level" href="../../../boost/serialization/level.hpp">
 boost/serialization/level.hpp
 </a>
-<dd>To override the default implementaton level trait for a type.</dd>
+<dd>To override the default implementation level trait for a type.</dd>

 <dt><a target="tracking" href="../../../boost/serialization/tracking.hpp">
 boost/serialization/tracking.hpp
@@ -320,7 +320,7 @@ 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 
 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.
+contains code to strip out and ignore any names attached to objects.
 <p>
 <dt><a target="common_iarchive" href="../../../boost/archive/detail/common_iarchive.hpp">
 boost/archive/detail/common_iarchive.hpp
@@ -343,7 +343,7 @@ and implementation are factored out into separate classes to minimize code dupli

 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.
+These are included as necessary by the archive class implementations listed above.
 This has the unfortunate side effect of making the implementation less transparent.
 Users should never find it necessary to change these files.
 <p>
@@ -364,19 +364,19 @@ archive class.
 the archive hierarchy.

 <pre><code>
-template<class T>
-void save_override(T & t, BOOST_PFTO int){
+template&lt;class T&gt;
+void save_override(T &amp; t, BOOST_PFTO int){
    // All for otherwise unhandled types are forwarded to the base class.
    // This emulates behavior for function overloading.
-    this->base::save_override(t, 0);
+    this-&gt;base::save_override(t, 0);
 }
-void save_override(const some_type & t, int){
+void save_override(const some_type &amp; t, int){
    // any special handling for some type
    // this will usually entail forwarding some other operation
    // in the most derived class.
-    this->This()->...
+    this-&gt;This()-&gt;...
    // or in one of its parents basic_text_oprimitive
-    this->This()->save(static_cast&lt;int&gt;(t));
+    this-&gt;This()-&gt;save(static_cast&lt;int&gt;(t));
 }
 ... // other special type handling
 </code></pre>
@@ -408,7 +408,7 @@ Building of the library generates and compiles code for all archives implemented
  rather than each time a user's program is recompiled.  This can save much
  development time.
  <li>Headers which solely related to implementation need only be included
-  in the library code modules. This prevents a user program from accidently 
+  in the library code modules. This prevents a user program from accidentally 
  depending on an implementation feature of the serialization library.
  <li>In building the library I came to the conclusions that there can arise
  situations regarding static code/data instantiation that could not be 
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -147,7 +147,7 @@ If <code style="white-space: normal">/Zc:wchar_t</code> is specified on the
 compile command line, <code style="white-space: normal">wchar_t</code> will be 
 considered an intrinsic type - otherwise
 it will be treated as a synonym for a 16 bit integer.  The library can be used
-either way - <strong>BUT</strong> - both the libray <strong>AND</strong> the application 
+either way - <strong>BUT</strong> - both the library <strong>AND</strong> the application 
 must be  compiled with the same switch settings.  Note that <code style="white-space: normal">BJAM</code>
 includes this switch by default.  So if want to use the libraries that
 <code style="white-space: normal">BJAM</code> builds, you should include this switch
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -32,7 +32,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 </dl>

 These are not part of the library itself, but rather
-techiques on how to use the library to address specific situations.
+techniques 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
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -127,7 +127,7 @@ XML, or some other created by the user of this library.
      This library has similar goals to this one. Some aspects of the
      implemenation are also similar.  As of this writing, it would seem that:
      <ul>
-          <li>Portability(1) is guarenteed only for recent versions of GCC.
+          <li>Portability(1) is guaranteed only for recent versions of GCC.
          <li>Versioning(3) of class definitions is not explicitly supported by
          the library.
          <li>it doesn't seem to automatically account for shared pointers(5).
@@ -1,4 +1,10 @@
 <html>
+<!--
+Copyright 2008 Matthias Troyer
+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)
+-->
 <head>
 <title>Boost Library Status Automatic Test</title>
 </head>
@@ -26,5 +32,10 @@
 <tr><td>performance_iterators</a></td><td align="right">Pass <a href="profile2.txt"><i>Profile</i></a></td></tr>
 <tr><td>performance_iterators_base64</a></td><td align="right">Pass <a href="profile3.txt"><i>Profile</i></a></td></tr>
 </table>
+<hr>
+<p><i>&copy; Copyright 2008 Matthias Troyer.
+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>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -41,7 +41,7 @@ struct A {
    // class a contains a pointer to a "hidden" declaration
    B *pimpl;
    template&lt;class Archive&gt;
-    void serialize(Archive & ar, const unsigned int file_version);
+    void serialize(Archive &amp; ar, const unsigned int file_version);
    A();
 };
 </code></pre>
@@ -59,8 +59,8 @@ by:
 struct B {
    int b;
    template&lt;class Archive&gt;
-    void serialize(Archive & ar, const unsigned int file_version){
-        ar & b;
+    void serialize(Archive &amp; ar, const unsigned int file_version){
+        ar &amp; b;
    }
 };

@@ -74,8 +74,8 @@ A::~A(){

 // now we can define the serialization for class A
 template&lt;class Archive&gt;
-void A::serialize(Archive & ar, const unsigned int file_version){
-    ar & pimpl;
+void A::serialize(Archive &amp; ar, const unsigned int file_version){
+    ar &amp; pimpl;
 }
 </code></pre>
 As described in <a href="bibliography.html#10">[10]</a> this brings the
@@ -88,8 +88,8 @@ following advantages:
 So, we compile the modules and everything is fine.  However when we
 link, we get an error.  Two symbols are undefined:
 <pre><code>
-void A::serialize(boost::archive::text_oarchive & ar, const unsigned int file_version);
-void A::serialize(boost::archive::text_iarchive & ar, const unsigned int file_version);
+void A::serialize(boost::archive::text_oarchive &amp; ar, const unsigned int file_version);
+void A::serialize(boost::archive::text_iarchive &amp; ar, const unsigned int file_version);
 </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.
@@ -103,11 +103,11 @@ example, including the the following code in any *.cpp file does just that:
 #include &lt;boost/archive/text_oarchive.hpp&gt;

 template void A::serialize&lt;boost::archive::text_iarchive&gt;(
-    boost::archive::text_iarchive & ar, 
+    boost::archive::text_iarchive &amp; ar, 
    const unsigned int file_version
 );
 template void A::serialize&lt;boost::archive::text_oarchive&gt;(
-    boost::archive::text_oarchive & ar, 
+    boost::archive::text_oarchive &amp; ar, 
    const unsigned int file_version
 );
 </code></pre>
@@ -115,7 +115,7 @@ The program should now link as well as compile.
 <p>
 The downside of this is that one has to know which archives are going 
 to be used with hidden serializations.  This is an effect of using template
-driven code.  One can invoke explicity instantiation for all known templates and
+driven code.  One can invoke explicitly instantiation for all known templates and
 presume that the linker will exclude unreferenced code.  This should
 work but is platform dependent.
 <hr>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -33,31 +33,31 @@ classes and types. That is, the following program compiles and runs exactly as o
 // 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
+// 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)

-#include <fstream>
-#include <boost/config.hpp>
+#include &lt;fstream&gt;
+#include &lt;boost/config.hpp&gt;
 #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>
+#include &lt;boost/serialization/access.hpp&gt;
+#include &lt;boost/serialization/base_object.hpp&gt;
+#include &lt;boost/serialization/export.hpp&gt;

 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);
+    template&lt;class Archive&gt;
+    void serialize(Archive &amp; ar, const unsigned int version){
+        ar &amp; BOOST_SERIALIZATION_NVP(m_i);
    }
 protected:
-    bool equals(const Base &rhs) const {
+    bool equals(const Base &amp;rhs) const {
        return m_i == rhs.m_i;
    }
    Base(int i = 0) :
@@ -68,16 +68,16 @@ protected:
 class Derived : private Base {
    friend class boost::serialization::access;
 private:
-    Base & base_cast(){
-        return static_cast<Base &>(*this);
+    Base &amp; base_cast(){
+        return static_cast&lt;Base &amp;&gt;(*this);
    }
-    template<class Archive>
-    void serialize(Archive & ar, const unsigned int version){
-        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
+    template&lt;class Archive&gt;
+    void serialize(Archive &amp; ar, const unsigned int version){
+        ar &amp; BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
    }
 public:
-    bool operator==(const Derived &rhs) const {
-        return Base::equals(static_cast<const Base &>(rhs));
+    bool operator==(const Derived &amp;rhs) const {
+        return Base::equals(static_cast&lt;const Base &amp;&gt;(rhs));
    }
    Derived(int i = 0) :
        Base(i)
@@ -94,12 +94,12 @@ main( int /* argc */, char* /* argv */[] )
    {   
        test_ostream os(testfile);
        test_oarchive oa(os);
-        oa << boost::serialization::make_nvp("a", a);
+        oa &lt;&lt; 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);
+        ia &gt;&gt; boost::serialization::make_nvp("a", a1);
    }
    std::remove(testfile);

@@ -107,17 +107,17 @@ main( int /* argc */, char* /* argv */[] )
        return 1;

    // serialize Derived and Base
-    Derived *ta = &a;
+    Derived *ta = &amp;a;
    Derived *ta1 = NULL;
    {   
        test_ostream os(testfile);
        test_oarchive oa(os);
-        oa << boost::serialization::make_nvp("ta", ta);
+        oa &lt;&lt; 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);
+        ia &gt;&gt; boost::serialization::make_nvp("ta", ta1);
    }
    std::remove(testfile);
    if(*ta != *ta1)
@@ -134,10 +134,10 @@ a pointer to the base class.  Included in the macro
 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
+derived classes through pointers to a polymorphic base class.  This code requires
 the ability to invoke
 <code>
-static_cast&lt;Base &&gt;(Derived &)
+static_cast&lt;Base &amp;&gt;(Derived &amp;)
 </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 
@@ -146,18 +146,18 @@ indicating invalid cast.
 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(
+    template&lt;class Archive&gt;
+    void serialize(Archive &amp; ar, const unsigned int version){
+        //ar &amp; BOOST_SERIALIZATION_BASE_OBJECT_NVP(Base);
+        ar &amp; boost::serialization::make_nvp(
            "Base",
-            static_cast&lt;Base &&gt;(*this)
+            static_cast&lt;Base &amp;&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>
+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.
@@ -2,15 +2,15 @@
 <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
+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)
 -->
 <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>Seriealization - Rationale</title>
+<title>Serialization - Rationale</title>
 </head>
 <body link="#0000ff" vlink="#800080">
 <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -101,8 +101,8 @@ For class/struct types, the template operators &amp;, &lt;&lt;, and &gt;&gt;
 will generate code that invokes the programmer's serialization code for the
 particular data type.  There is no default.  An attempt to serialize a
 class/struct for which no serialization has been explicitly specified
-will result in a compile time error.  The serialiation of a class can
-be specified via either a class member function or a free funcation which
+will result in a compile time error.  The serialization of a class can
+be specified via either a class member function or a free function which
 takes a reference to an instance of the class as an argument.

 <h3><a name="member">Member Function</a></h3>
@@ -180,7 +180,7 @@ possible to serialize them.  So in some instances, minor modifications to the
 class to be serialized will be necessary even when using this "non-intrusive"
 method.  In practice this may not be such a problem as many libraries 
 (E.G. STL) expose enough information to permit implementation of non-intrusive
-serialization with absolutly no changes to the library.
+serialization with absolutely no changes to the library.

 <h4><a name="namespaces">Namespaces for Free Function Overrides</a></h4>
 For maximum portability, include any free functions templates and definitions in the 
@@ -219,7 +219,7 @@ base_object.hpp
 includes the template:
 <pre><code>
 template&lt;class Base, class Derived&gt;
-Base & base_object(Derived &d);
+Base &amp; base_object(Derived &amp;d);
 </code></pre>
 which should be used to create a reference to an object of the base
 which can be used as an argument to the archive serialization operators.
@@ -255,7 +255,7 @@ Loading <code style="white-space: normal">const</code> members can be addressed
    ar &amp; const_cast&lt;T &amp;&gt;(t);
 </code></pre>
 Note that this violates the spirit and intention of the <code style="white-space: normal">const</code>
-keyword. <code style="white-space: normal">const</code> members are intialized when a class instance
+keyword. <code style="white-space: normal">const</code> members are initialized when a class instance
 is constructed and not changed thereafter.  However, this may
 be most appropriate in many cases.  Ultimately, it comes down to 
 the question about what <code style="white-space: normal">const</code> means in the context
@@ -463,7 +463,7 @@ following situations must be addressed:
    be determined and saved. Upon restoration the correct type
    must be created and its address correctly cast to the base
    class. That is, polymorphic pointers have to be considered.
-    <li>NULL pointers must be dectected when saved and restored
+    <li>NULL pointers must be detected when saved and restored
    to NULL when deserialized.
 </ol>

@@ -543,7 +543,7 @@ private:
        ar &amp; m_state;
    }
 public:
-    // no default construct guarentees that no invalid object
+    // no default construct guarantees that no invalid object
    // ever exists
    my_class(int attribute) :
        m_attribute(attribute),
@@ -591,7 +591,7 @@ class derived_one : public base {
 class derived_two : public base {
    ...
 };
-main(){
+int main(){
    ...
    base *b;
    ...
@@ -604,7 +604,7 @@ Should it be an object of class <code style="white-space: normal">derived_one</c
 <code style="white-space: normal">derived_two</code>, or maybe <code style="white-space: normal">base</code>?
 <p>
 It turns out that the kind of object serialized depends upon whether the base class
-(<code style="white-space: normal">base</code> in this case) is polymophic or not.
+(<code style="white-space: normal">base</code> in this case) is polymorphic or not.
 If <code style="white-space: normal">base</code> is not polymorphic, that is if it has no
 virtual functions, then an object of the type <code style="white-space: normal">base</code>
 will be serialized. Information in any derived classes will be lost. If this is what is desired
@@ -630,7 +630,7 @@ the same sequence.  This includes "registration".
 <p>
 Expanding our previous example:
 <pre><code>
-main(){
+int main(){
    derived_one d1;
    derived_two d2:
    ...
@@ -659,11 +659,11 @@ This can be addressed by registering the derived class explicitly.  All archives
 derived from a base class which implements the following template:
 <pre><code>
 template&lt;class T&gt;
-register_type();
+register_type(T * = NULL);
 </code></pre>
 So our problem could just as well be addressed by writing:
 <pre><code>
-main(){
+int main(){
    ...
    ar.template register_type&lt;derived_one&gt;();
    ar.template register_type&lt;derived_two&gt;();
@@ -674,7 +674,7 @@ main(){
 </code></pre>
 Note that if the serialization function is split between save and load, both
 functions must include the registration.  This is required to keep the save
-and corresponding load in syncronization.
+and corresponding load in synchronization.

 <h4><a name="export">Export</a></h4>
 The above will work but may be inconvenient.  We don't always know which derived
@@ -690,7 +690,7 @@ So we have another method:
 BOOST_CLASS_EXPORT_GUID(derived_one, "derived_one")
 BOOST_CLASS_EXPORT_GUID(derived_two, "derived_two")

-main(){
+int main(){
    ...
    base *b;
    ...
@@ -719,7 +719,7 @@ This means that serialization code must be instantiated for each
 combination of archive and data type that is serialized in the program.
 <p>
 Polymorphic pointers of derived classes may never be referred to 
-explictly by the program so normally code to serialize such classes
+explicitly by the program so normally code to serialize such classes
 would never be instantiated.  So in addition to including export key
 strings in an archive, <code style="white-space: normal">BOOST_CLASS_EXPORT_GUID</code> explicitly
 instantiates the class serialization code for all archive classes used 
@@ -755,7 +755,7 @@ can be used.
 In order to properly translate between base and derived pointers
 at runtime, the system requires each base/derived pair be found
 in a table.  A side effect of serializing a base object with
-<code style="white-space: normal">boost::serialization::base_object&lt;Base&gt;(Derived &)</code>
+<code style="white-space: normal">boost::serialization::base_object&lt;Base&gt;(Derived &amp;)</code>
 is to ensure that the base/derived pair is added to the table
 before the <code style="white-space: normal">main</code> function is entered.
 This is very convenient and results in a clean syntax.  The only
@@ -789,7 +789,7 @@ 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);
+        ar &amp; 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),
@@ -800,7 +800,7 @@ class derived : public base {

 BOOST_CLASS_EXPORT_GUID(derived, "derived")

-main(){
+int main(){
    //...
    std::stringstream ss;
    boost::archive::text_iarchive ar(ss);
@@ -919,6 +919,7 @@ As of this writing, the library contains serialization of the following boost cl
  <li>shared_ptr
  <li>auto_ptr (demo)
 </ul>
+C++17 <code style="white-space: normal">std::variant is supported as well</code>.
 Others are being added to the list so check the boost files section and headers for
 new implementations!
 <hr>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -92,32 +92,32 @@ instance of <code style="white-space: normal">sp_counted_base_impl<T, ...></code
 doesn't have a default constructor, serialization requires
 specification of the following overload:
 <pre><code>
-template&lt;class Archive, class P, class D>
+template&lt;class Archive, class P, class D&gt;
 inline void save_construct_data(
    Archive &amp; ar,
-    const boost::detail::sp_counted_base_impl<P, D> * t, 
+    const boost::detail::sp_counted_base_impl&lt;P, D&gt; * t, 
    const unsigned int file_version
 ){
    // variables used for construction
-    ar &lt;&lt; t->ptr;
+    ar &lt;&lt; t-&gt;ptr;
    ar &lt;&lt; *t;
 }

-template<class Archive, class P, class D>
+template&lt;class Archive, class P, class D&gt;
 inline void load_construct_data(
    Archive &amp; ar,
-    boost::detail::sp_counted_base_impl<P, D> * t, 
+    boost::detail::sp_counted_base_impl&lt;P, D&gt; * t, 
    const unsigned int file_version
 ){
    P ptr_;
    ar &gt;&gt; ptr_;
    // placement new
-    ::new(t)boost::detail::sp_counted_base_impl<P, D>(ptr_,  D());
-    ar &gt;&gt;; *t;
+    ::new(t)boost::detail::sp_counted_base_impl&lt;P, D&gt;(ptr_,  D());
+    ar &gt;&gt; *t;
 }
 </code></pre>
 The statement <code style="white-space: normal">ar &gt;&gt; ptr_</code> is key. This deserializes
-the same pointer deserialzed above.  Default object tracking will ensure
+the same pointer deserialized 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>
@@ -135,7 +135,7 @@ inline void serialize(
    const unsigned int file_version,
    int
 ){
-    ar & boost::serialization::base_object&lt;
+    ar &amp; boost::serialization::base_object&lt;
 	boost::detail::sp_counted_base
    &gt;(*this);
 }
@@ -170,7 +170,7 @@ This indicates that we're not quite done.  Due to default object
 tracking, <code style="white-space: normal">sp_counted_base_impl&lt;P, D&gt;</code> is only
 created once regardless of how many shared pointers point to the
 same object.  Of course, it has to be this way. The reference
-count starts at 1 and is never incrememented.  Code must be added
+count starts at 1 and is never incremented.  Code must be added
 to the serialization functions to maintain the proper reference
 count.
 <p>
@@ -191,13 +191,13 @@ In this case we need only the latter function so we can replace the
 base object serialization with:
 <pre><code>
 // register the relationship between each derived class
-// its polymorphic base
+// and its polymorphic base
 void_cast_register&lt;
    boost::detail::sp_counted_base_impl&lt;P, D&gt;
    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 trivial 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.
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -40,24 +40,24 @@ Unfortunately, this way of doing it suffered from some undesirable features
 <pre><code>
 template&lt;class Archive, class T&gt;
 inline void save(
-    Archive & ar,
-    const boost::shared_ptr&ltT&gt; &t,
+    Archive &amp; ar,
+    const boost::shared_ptr&lt;T&gt; &amp;t,
    const unsigned int /* file_version */
 ){
    const T * t_ptr = t.get();
    // just serialize the underlying raw pointer
-    ar &lt;&lt: boost::serialization::make_nvp("px", t_ptr);
+    ar &lt;&lt; boost::serialization::make_nvp("px", t_ptr);
 }

-template&lt;class Archive, class T&gt
+template&lt;class Archive, class T&gt;
 inline void load(
-    Archive & ar,
-    boost::shared_ptr&lt;T&gt; &t,
+    Archive &amp; ar,
+    boost::shared_ptr&lt;T&gt; &amp;t,
    const unsigned int file_version
 ){
    T* r;
    // recover the underlying raw pointer
-    ar >> boost::serialization::make_nvp("px", r);
+    ar &gt;&gt; boost::serialization::make_nvp("px", r);

    // To Do - match up with other shared pointers which 
    // use this same raw pointer.
@@ -2,8 +2,8 @@
 <html>
 <!--
 (C) Copyright 2002-10 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
+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)
 -->
 <head>
@@ -39,7 +39,7 @@ is trivially easy:
 ...
 // display the complete schedule
 simple_log_archive log(std::cout);
-log << schedule;
+log &lt;&lt; schedule;
 </code></pre>

 and it produces the following output
@@ -52,10 +52,10 @@ schedule
   driver bob
   hour 6
   minute 24
-  second -> 
+  second -&gt; 
   stops 
    count 3
-    item -> 
+    item -&gt; 
     latitude 
      degrees 34
      minutes 135
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -51,7 +51,7 @@ requires consideration of the following issues:
  be taken to be sure that they are instantiated</li>
  <li>In a multi-threading system, its possible that these static variables
  will be accessed concurrently by separate threads.  This would create a
-  race condition with unpredictabe behavior</li>
+  race condition with unpredictable behavior</li>
 </ul>
 This singleton class addresses all of the above issues.

@@ -94,12 +94,12 @@ This singleton implementation has the following features:
 namespace boost { 
 namespace serialization {

-template <class T>
+template &lt;class T&gt;
 class singleton : public boost::noncopyable
 {
 public:
-    static const T & get_const_instance();
-    static T & get_mutable_instance();
+    static const T &amp; get_const_instance();
+    static T &amp; get_mutable_instance();
    static bool is_destroyed();
 };

@@ -110,14 +110,14 @@ public:
 <dl>

 <dt><h4><pre><code>
-static const T & get_const_instance();
+static const T &amp; get_const_instance();
 </code></pre></h4></dt>
 <dd>
 Retrieve a constant reference to the singleton for this type.
 </dd>

 <dt><h4><pre><code>
-static T & get_mutable_instance();
+static T &amp; get_mutable_instance();
 </code></pre></h4></dt>
 <dd>
 Retrieve a mutable reference to the singleton for this type.
@@ -139,7 +139,7 @@ In order to be used as
 <code style="white-space: normal">
 singleton&lt;T&gt;
 </code>
-</a>, the type T must be default constructable. 
+</a>, the type T must be default constructible. 
 It doesn't require static variables - though it may have them.
 Since the library guarantees that only one instance of 
 <a target="singleton.hpp" href = "../../../boost/serialization/singleton.hpp">
@@ -147,7 +147,7 @@ Since the library guarantees that only one instance of
 singleton&lt;T&gt;
 </code>
 </a> 
-exists and all accesss is through the above static interface
+exists and all access 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.
@@ -242,7 +242,7 @@ 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.
 All serialization tests invoke <code style="white-space: normal">lock()</code>
-at the start of the progam.  For programs compiled in release
+at the start of the program.  For programs compiled in release
 mode these functions have no effect.

 <hr>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -30,18 +30,18 @@ To cast from one type to another related type, C++ provides the following
 operators:

 <dl>
-  <dt><code>static_cast&lt;T *<&gt;(U *)<br>static_cast&lt;T &<&gt;(U &)</code></dt>
+  <dt><code>static_cast&lt;T *&gt;(U *)<br>static_cast&lt;T &amp;&gt;(U &amp;)</code></dt>
  <dd>
    <ul>
      <li>required if neither T nor U are polymorphic
      <li>permitted in other cases.
-      <li>fails to detect erroneous casts of polymophic pointers/references at runtime.
+      <li>fails to detect erroneous casts of polymorphic pointers/references at runtime.
      <li>does not permit "cross casting"
      <li>inline function calls can be optimized away during compile time.
    </ul>
  </dd>
  <p>
-  <dt><code>dynamic_cast&lt;T *<&gt;(U *)<br>dynamic_cast&lt;T &<&gt;(U &)</code></dt>
+  <dt><code>dynamic_cast&lt;T *&gt;(U *)<br>dynamic_cast&lt;T &amp;&gt;(U &amp;)</code></dt>
  <dd>
    <ul>
      <li>permitted if either T or U are polymorphic
@@ -127,16 +127,16 @@ situation exemplified above.
 The following syntax is supported:
 <pre><code>
 smart_cast&lt;Target *, Source *&gt;(Source * s);
-smart_cast&lt;Target *>(Source * s);
-smart_cast&lt;Target &, Source &amp;&gt(Source &amp; s);
+smart_cast&lt;Target *&gt;(Source * s);
+smart_cast&lt;Target &amp;, Source &amp;&gt;(Source &amp; s);
 </code></pre>
 Note that the above syntax doesn't include 
 <pre><code>
-smart_cast&lt;Target &amp; &gt(Source &amp; s)
+smart_cast&lt;Target &amp; &gt;(Source &amp; s)
 </code></pre>
 but the same functionality is supported with the following special syntax
 <pre><code>
-smart_cast_reference&lt;Target &amp;&gt(Source &amp; s)
+smart_cast_reference&lt;Target &amp;&gt;(Source &amp; s)
 </code></pre>

 <h3>Requirements</h3>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -54,10 +54,10 @@ can also be used to delete objects created during a loading process
 that has been interrupted by throwing of an exception.  
 <p>
 This could cause problems in 
-progams where the copies of different objects are saved from the same address.
+programs where the copies of different objects are saved from the same address.
 <pre><code>
 template&lt;class Archive&gt;
-void save(boost::basic_oarchive  &amp; ar, const unsigned int version) const
+void save(boost::basic_oarchive &amp; ar, const unsigned int version) const
 {
    for(int i = 0; i &lt; 10; ++i){
        A x = a[i];
@@ -101,7 +101,7 @@ A similar problem can occur when different objects are loaded to an address
 which is different from the final location:
 <pre><code>
 template&lt;class Archive&gt;
-void load(boost::basic_oarchive  &amp; ar, const unsigned int version) const
+void load(boost::basic_oarchive &amp; ar, const unsigned int version) const
 {
    for(int i = 0; i &lt; 10; ++i){
        A x;
@@ -118,14 +118,14 @@ addressed by altering the above code thusly:

 <pre><code>
 template&lt;class Archive&gt;
-void load(boost::basic_iarchive  &amp; ar, const unsigned int version) const
+void load(boost::basic_iarchive &amp; ar, const unsigned int version) const
 {
    for(int i = 0; i &lt; 10; ++i){
        A x;
        ar &gt;&gt; x;
        std::pair&lt;std::set::const_iterator, bool&gt; result;
        result = std::m_set.insert(x);
-        ar.reset_object_address(& (*result.first), &x);
+        ar.reset_object_address(&amp; (*result.first), &amp;x);
    }
 }
 </code></pre>
@@ -159,7 +159,7 @@ BOOST_CLASS_TRACKING(my_virtual_base_class, boost::serialization::track_always)
 <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
+algorithms.  The principle 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.
@@ -170,7 +170,7 @@ 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>
+template&lt;class T&gt;
 class shared_ptr
 {
   ...
@@ -182,9 +182,9 @@ 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 *);
+  shared_ptr&lt;T&gt; lookup(const T *);
  // insert a new shared_ptr
-  void insert<shared_ptr<T> >(const shared_ptr<T> *);
+  void insert&lt;shared_ptr&lt;T&gt; &gt;(const shared_ptr&lt;T&gt; *);
 };

 namespace boost {
@@ -220,7 +220,7 @@ void load(Archive &amp; ar, shared_ptr &amp; x, const unsigned int /* version */
    // if found, return the one from the table

    // load the shared_ptr data
-    shared_ptr<T> sp = ...
+    shared_ptr&lt;T&gt; sp = ...

    // and add it to the table
    hlp.insert(sp);
@@ -322,7 +322,7 @@ Another potential problem is illustrated by the following example:
 template&lt;class T&gt;
 struct my_wrapper {
    template&lt;class Archive&gt;
-    Archive & serialize ...
+    Archive &amp; serialize ...
 };

 ...
@@ -331,9 +331,9 @@ class my_class {
    wchar_t a;
    short unsigned b;
    template&lt;class Archive&gt;
-    Archive & serialize(Archive & ar, unsigned int version){
-        ar & my_wrapper(a);
-        ar & my_wrapper(b);
+    Archive &amp; serialize(Archive &amp; ar, unsigned int version){
+        ar &amp; my_wrapper(a);
+        ar &amp; my_wrapper(b);
    }
 };
 </code></pre>
@@ -379,7 +379,7 @@ XML format has a nested structure that maps well to the "recursive class member
 used by the serialization system. However, XML differs from other formats in that it 
 requires a name for each data member. Our goal is to add this information to the 
 class serialization specification while still permiting the the serialization code to be 
-used with any archive. This is achived by requiring that all data serialized to an XML archive
+used with any archive. This is archived by requiring that all data serialized to an XML archive
 be serialized as a <a target="detail" href="wrappers.html#nvp">name-value pair</a>.
 The first member is the name to be used as the XML tag for the
 data item while the second is a reference to the data item itself. Any attempt to serialize data
@@ -429,7 +429,7 @@ BOOST_CLASS_EXPORT(a)
 </code></pre>
 This will be true regardless of whether the code is part
 of a stand alone executable, a static library or
-a dyanmic or shared library.  
+a dynamic or shared library.  
 <p>
 Including
 <code style="white-space: normal">BOOST_CLASS_EXPORT</code>
@@ -451,12 +451,12 @@ in library code will have no effect unless archive class headers are
 also included.  So when building a library, one should include all headers
 for all the archive classes which he anticipates using. Alternatively,
 one can include headers for just the
-<a href="archive_reference.html#polymorphic">Polymoprhic Archives</a>.
+<a href="archive_reference.html#polymorphic">Polymorphic Archives</a>.

 <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
+what would be a catastrophic error, the library traps ALL serializations through
 a pointer to a polymorphic class 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. 
@@ -507,7 +507,7 @@ and
 <a href = "../example/demo_pimpl_A.hpp" target="demo_pimpl">
 <code style="white-space: normal">demo_pimpl_A.hpp</code>
 </a>
-where implementation of serializaton is in a static library 
+where implementation of serialization is in a static library 
 completely separate from the main program.

 <h3><a name="dlls">DLLS - Serialization and Runtime Linking</a></h3>
@@ -526,7 +526,7 @@ and
 <a href = "../test/dll_a.cpp" target="dll_a">
 <code style="white-space: normal">dll_a.cpp</code>
 </a>
-where implementation of serializaton is also completely separate
+where implementation of serialization is also completely separate
 from the main program but the code is loaded at runtime.  In this
 example, this code is loaded automatically when the program which
 uses it starts up, but it could just as well be loaded and unloaded 
@@ -552,28 +552,28 @@ needlessly duplicates code.  Worse, it makes is possible for
 different versions of the same code to 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
-might be explictly unloaded which would (hopefully) result in
+might be explicitly 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

 <pre><code>
 template&lt;class Archive&gt;
-void serialize(Archive & ar, const unsigned int version);
+void serialize(Archive &amp; ar, const unsigned int version);
 </code></pre>
 in the header, and

 <pre><code>
 template&lt;class Archive&gt;
-void myclass::serialize(Archive & ar, const unsigned int version){
+void myclass::serialize(Archive &amp; ar, const unsigned int version){
 	...
 }

-BOOST_EXPORT_CLASS_IMPLEMENT(my_class)
+BOOST_CLASS_EXPORT_IMPLEMENT(my_class)

 #include &lt;boost/archive/text_oarchive&gt;
-#include &lt;boost/archive/text_iarchive&lt;
-template myclass::serialize(boost::archive::text_oarchive & ar, const unsigned int version);
-template myclass::serialize(boost::archive::text_iarchive & ar, const unsigned int version);
+#include &lt;boost/archive/text_iarchive&gt;
+template myclass::serialize(boost::archive::text_oarchive &amp; ar, const unsigned int version);
+template myclass::serialize(boost::archive::text_iarchive &amp; ar, const unsigned int version);
 ... // repeat for each archive class to be used.
 </code></pre>
 in the implementation file.  This will result in generation of all code
@@ -624,7 +624,7 @@ about which is known only 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.
+The library implementation presumes that the application avoids such a situation.
 <p>
 However, Writing/Reading different archives simultaneously
 in different tasks is permitted as each archive instance is (almost) 
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -32,7 +32,7 @@ and resets the object's state at destruction time, undoing any change the object
 may have gone through.  Here is the interface:

 <pre><code>
-template<class T>
+template&lt;class T&gt;
 // T requirements:
 //  - POD or object semantic (cannot be reference, function, ...)
 //  - copy constructor
@@ -43,7 +43,7 @@ private:
    ... // implementation

 public:
-    state_saver(T & object);
+    state_saver(T &amp; object);
    ~state_saver();
 };
 </code></pre>
@@ -56,7 +56,7 @@ The following illustrates how this is expected to be used.
 <pre><code>
 #include &lt;boost/state_saver.hpp&gt;

-void func(A & a)
+void func(A &amp; a)
    boost::state_saver&lt;A&gt; s(a);
    ... // alter state of a by calling non-const functions
    ... // call other functions
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -9,7 +9,7 @@ pre{

 /*
 (C) Copyright 2008 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
+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)
 */
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -48,7 +48,7 @@ type, the way it is used and specifications of the programmer.
 <p>
 One can alter the manner in which a particular data type is serialized
 by specifying one or more <strong>class serialization traits</strong>.
-It is not generally necessary for the programmer to explictly assign
+It is not generally necessary for the programmer to explicitly assign
 traits to his classes as there are default values for all traits.
 If the default values are not appropriate they can be assigned by the programmer.
 A template is used to associate a typename with a constant.  For example
@@ -196,7 +196,7 @@ Default tracking traits are:
 The default behavior is almost always the most convenient one.  However,
 there a few cases where it would be desirable to override the
 default.  One case is that of a virtual base class. In a diamond
-heritance structure with a virtual base class, object tracking
+inheritance structure with a virtual base class, object tracking
 will prevent redundant save/load invocations.  So here is one
 case where it might be convenient to override the default tracking
 trait. <i>(Note: in a future version the default will be reimplemented
@@ -217,13 +217,13 @@ This is addressed by invoking
 <code style="white-space: normal">BOOST_CLASS_EXPORT_IMPLEMENT(T)</code>
 in the file which defines (implements) the class T.
 This ensures that code for the derived class T will
-be explicity instantiated.
+be explicitly instantiated.
 <li> There needs to be some sort of identifier which can
 be used to select the code to be invoked when the object
 is loaded.
 Standard C++ does implement <code style="white-space: normal">typeid()</code> which can be
 used to return a unique string for the class.  This is not entirely
-statisfactory for our purposes for the following reasons:
+satisfactory for our purposes for the following reasons:
 <ul>
  <li>There is no guarantee that the string is the same across platforms.
  This would then fail to support portable archives.
@@ -250,7 +250,7 @@ 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.
-<i>(<b>GUID</b> stands for <b>G</b>lobally <b>U</b>nique <b>ID</b>entfier.)</i>
+<i>(<b>GUID</b> stands for <b>G</b>lobally <b>U</b>nique <b>ID</b>entifier.)</i>
 <p>
 <i>(<a target="detail" href="special.html#export">Elsewhere</a>
 in this manual, the serialization of derived classes is addressed in detail.)</i>
@@ -387,9 +387,9 @@ file <a href="../../../boost/serialization/is_bitwise_serializable.hpp" target="
 is used:
 <pre><code>
 namespace boost { namespace serialization {
-    template<class T>
+    template&lt;class T&gt;
    struct is_bitwise_serializable
-     : public is_arithmetic<T>
+     : public is_arithmetic&lt;T&gt;
    {};
 } }
 </code></pre>
@@ -516,7 +516,7 @@ 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 surprising behavior.  To 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
@@ -528,7 +528,7 @@ usage.  Here is a list of the conflicts trapped:
 <dt><h2><a name="object_level">object_level</a> - error</h2></dt>
 <dd>
 This error traps attempts to serialize types whose
-implentation level is set to non_serializable.
+implementation level is set to non_serializable.
 </dd>
 <dt><h2><a name="object_versioning">object_versioning</a> - error</h2></dt>
 <dd>
@@ -561,7 +561,7 @@ Likewise, the following code will trap at compile time:

 <code style="white-space: normal"><pre>
 T * t;
-ar >> t;
+ar &gt;&gt; t;
 </pre></code>

 if the tracking_level serialization trait is set to "track_never".
@@ -617,7 +617,7 @@ void main(){
 class K { 
    shared_ptr &lt;construct_from&gt; z; 
    template &lt;class Archive&gt; 
-    void serialize(Archive & ar, const unsigned version){ 
+    void serialize(Archive &amp; ar, const unsigned version){ 
        ar &lt;&lt; z; 
    } 
 }; 
@@ -630,9 +630,9 @@ class K {
  <li>Things continue smoothly as before.  A month goes by and it's 
  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, 
+  first. After a series of very long and increasingly acrimonious email exchanges, 
 it's discovered 
-  that programmer(3) accidently broke programmer(2)'s code .This is because by 
+  that programmer(3) accidentally broke programmer(2)'s code .This is because by 
  serializing via a pointer, the "log" object is 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
@@ -683,7 +683,7 @@ ar &lt;&lt; x;
  <p>
  Things work fine and he moves on. 
  <p>
-  <li>Now programer (2) wants to make his change - and again another 
+  <li>Now programmer (2) wants to make his change - and again another 
  annoying const issue; 
 <code style="white-space: normal"><pre>
 Y y; 
@@ -709,7 +709,7 @@ ar &lt;&lt; x
      <p>
      <li>This is just crazy. Its making my life needlessly difficult and flagging 
      code that is just fine. So I'll fix this with a <code style="white-space: normal">const_cast</code>
-      and fire off a complaint to the list and mabe they will fix it. 
+      and fire off a complaint to the list and maybe they will fix it. 
      In this case, the story branches off to the previous scenario.
      <p>
      <li>Oh, this trap is suggesting that the default serialization isn't really 
@@ -754,28 +754,28 @@ pay to avoid particularly vexing programming errors.

 <dt><h2><a name="pointer_level">pointer_level</a> - warning</h2></dt>
 <dd>
-This trap addresses the following situaion when serializing 
+This trap addresses the following situation when serializing 
 a pointer:
 <ul>
 <li>A type doesn't save class information in the
 archive. That is, the serialization trait implementation
-level <= object_serializable.
+level &lt;= object_serializable.
 <li>Tracking for this type is set to "track selectively"
 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 absence of the operation <code style="white-space: normal">ar &lt;&lt; T *</code> 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
-includes the operation ar >> T * so that tracking information
+includes the operation <code style="white-space: normal">ar &gt;&gt; T *</code> so that tracking information
 will be included in the archive. When a program which
-creates the archive doesn't include ar << T it is presumed
+creates the archive doesn't include <code style="white-space: normal">ar &lt;&lt; T</code> it is presumed
 that the archive doesn't include tracking information and
 the archive will fail to load.  Also the reverse situation could 
 trigger a similar problem.
 <p>
-Though this situation is unlikely for several reasones, 
+Though this situation is unlikely for several reasons, 
 it is possible - hence this warning. 
 </ul>
 So if your program traps here, consider changing the 
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -136,7 +136,7 @@ int main() {
 <p>For each class to be saved via serialization, there must exist a function to
 save all the class members which define the state of the class.
 For each class to be loaded via serialization, there must exist a function to
-load theese class members in the same sequence as they were saved.
+load these class members in the same sequence as they were saved.
 In the above example, these functions are generated by the
 template member function <code style="white-space: normal">serialize</code>.

@@ -185,7 +185,7 @@ The main application of non-intrusive serialization is to permit serialization
 to be implemented for classes without changing the class definition.
 In order for this to be possible, the class must expose enough information
 to reconstruct the class state.  In this example, we presumed that the
-class had <code style="white-space: normal">public</code> members - not a common occurence.  Only
+class had <code style="white-space: normal">public</code> members - not a common occurrence.  Only
 classes which expose enough information to save and restore the class
 state will be serializable without changing the class definition.
 <h3><a name="serializablemembers">Serializable Members</a></h3>
@@ -290,7 +290,7 @@ class bus_route
    void serialize(Archive &amp; ar, const unsigned int version)
    {
        int i;
-        for(i = 0; i &lt 10; ++i)
+        for(i = 0; i &lt; 10; ++i)
            ar &amp; stops[i];
    }
 public:
@@ -541,7 +541,7 @@ This is described later in the manual.
    <dd>This is a variation the original demo which supports xml archives in addition
    to the others. The extra wrapping macro, BOOST_SERIALIZATION_NVP(name), is 
    needed to associate a data item name with the corresponding xml 
-    tag. It is importanted that 'name' be a valid xml tag, else it 
+    tag. It is important that 'name' be a valid xml tag, else it 
    will be impossible to restore the archive. 
    For more information see
    <a target="detail" href="wrappers.html#nvp">Name-Value Pairs</a>.
@@ -573,7 +573,7 @@ with serialization implementations for the Standard Library, the serialization l
 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 
-as an excercise for the reader.
+as an exercise for the reader.

 <hr>
 <p><i>&copy; Copyright <a href="http://www.rrsd.com">Robert Ramey</a> 2002-2004. 
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -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 serialization of pointers to only such classes would diminish the applicability
 of the library.

 <h3>Usage</h3>
@@ -42,7 +42,7 @@ They are declared in the namespace
 <dl>
 <dt><h4><pre><code>
 template&lt;class Derived, class Base&gt;
-const void_cast_detail::void_caster &
+const void_cast_detail::void_caster &amp;
 void_cast_register(
    Derived const * derived = NULL, 
    Base * const base = NULL
@@ -67,8 +67,8 @@ This function "registers" a pair of related types.  It stores the fact that
 <dt><h4><pre><code>
 void *
 void_upcast(
-    extended_type_info const & derived_type,
-    extended_type_info const & base_type,
+    extended_type_info const &amp; derived_type,
+    extended_type_info const &amp; base_type,
    void * const t 
 );
 </code></pre></h4></dt>
@@ -76,8 +76,8 @@ void_upcast(
 <dt><h4><pre><code>
 void *
 void_downcast(
-    extended_type_info const & derived_type,
-    extended_type_info const & base_type,
+    extended_type_info const &amp; derived_type,
+    extended_type_info const &amp; base_type,
    void * const t 
 );
 </code></pre></h4></dt>
@@ -2,8 +2,8 @@
 <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
+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)
 -->
 <head>
@@ -64,7 +64,7 @@ Its sole purpose is to pass the data size and address as a pair to the archive c

 <h3><a name="arrays">Arrays</a></h3>
 An array is a contiguous sequence of homogeneous data types, such as a builtin
-C-array, a <code>boost::array&lt;T></code> or a <code>std::vector&lt;T></code>. 
+C-array, a <code>boost::array&lt;T&gt;</code> or a <code>std::vector&lt;T&gt;</code>. 
 The purpose of this wrapper is to support archive types (such as binary
 archives) that provide optimized serialization for contiguous sequences of 
 objects of the same type. 
@@ -75,12 +75,12 @@ array.hpp
 </a>
 includes the function
 <pre><code>
-template &lt;T>
+template &lt;T&gt;
 boost::serialization::make_array(T* t, std::size_t size);
 </code></pre>
 which will construct a temporary <code>array</code> object
 <pre><code>
-template<class T>
+template&lt;class T&gt;
 class array
 {
 public:    
@@ -118,7 +118,7 @@ An example of a strong typedef is the <code>collection_size_type</code> in the
 header file
 <a href="../../../boost/serialization/collection_size_type.hpp" target="collection_size_type_hpp">
 collection_size_type.hpp
-</a>. This type should be used for serializaing the size of a C++ collection, so
+</a>. This type should be used for serializing the size of a C++ collection, so
 that the archive can pick the best integral representation for the serialization
 of collection sizes. This is necessary since, although <code>std::size_t</code>
 is guaranteed to be an integral type large enough to represent the size of
@@ -158,27 +158,27 @@ The xml archive classes contain code similar to:
 <pre><code>
 // special treatment for name-value pairs.
 template&lt;class T&gt;
-xml_oarchive & operator&(const boost::serialization::nvp<T> & t)
+xml_oarchive &amp; operator&amp;(const boost::serialization::nvp&lt;T&gt; &amp; t)
 {
    // write an xml start tag
    start_tag(t.name());

    // serialize the data as usual
-    *this & t.value();
+    *this &amp; t.value();

    // write an xml end tag
    end_tag(t.name());
 }
 </code></pre>
-The most obvious and convient name to assign to as the XML data item name
+The most obvious and convenient name to assign to as the XML data item name
 is - surprise! - the name of the C++ class data member.  So our serialization
 code will look like:
 <pre><code>
-ar & make_nvp("my_variable", my_variable);
+ar &amp; make_nvp("my_variable", my_variable);
 </code></pre>
 To simplify typing and enhance readability a macro is defined so we can write:
 <pre><code>
-ar & BOOST_SERIALIZATION_NVP(my_variable);
+ar &amp; BOOST_SERIALIZATION_NVP(my_variable);
 </code></pre>
 Similarly there exists a macro definition that permits us to write:
 <pre><code>
@@ -200,7 +200,7 @@ is example of the XML Archive corresponding to our tutorial example.
 Wrappers should be designed so that they can be composed as necessary.
 For example, to pass binary data as a name value pair use:
 <pre><code>
-ar & make_nvp("named_binary_object", make_binary_object(address, size));
+ar &amp; make_nvp("named_binary_object", make_binary_object(address, size));
 </code></pre>
 </html>
 <hr>
@@ -19,19 +19,22 @@ import ../util/test :
    test-bsl-run
    test-bsl-run_archive
    test-bsl-run_files
-    test-bsl-run_polymorphic_archive
 ;

+# for [ requires auto_ptr ]
+import-search /boost/config/checks ;
+import config : requires ;
+
 test-suite "demo-suite" :
    # demos
    [ test-bsl-run demo ]
-    [ test-bsl-run demo_auto_ptr ]
+    [ test-bsl-run demo_auto_ptr : : : [ requires auto_ptr ] ]
    [ test-bsl-run demo_exception ]
    [ test-bsl-run demo_fast_archive ]
-    [ test-bsl-run demo_log : log_archive ]
+    [ test-bsl-run demo_log : log_archive : : <link>static ]
    [ 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_portable_archive : portable_binary_iarchive portable_binary_oarchive : : <link>static ]
    [ test-bsl-run demo_shared_ptr ]
    [ test-bsl-run demo_simple_log ]
    [ test-bsl-run demo_trivial_archive ]
@@ -2,8 +2,8 @@
 // demo.cpp
 //
 // (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
+// 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)


@@ -17,7 +17,7 @@

 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
-
+#include <boost/cstdint.hpp>
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/utility.hpp>
 #include <boost/serialization/list.hpp>
@@ -26,22 +26,22 @@
 /////////////////////////////////////////////////////////////
 // The intent of this program is to serve as a tutorial for
 // users of the serialization package.  An attempt has been made
-// to illustrate most of the facilities of the package.  
+// to illustrate most of the facilities of the package.
 //
-// The intent is to create an example suffciently complete to
+// The intent is to create an example sufficiently complete to
 // illustrate the usage and utility of the package while
-// including a minimum of other code. 
+// including a minimum of other code.
 //
 // This illustration models the bus system of a small city.
 // This includes, multiple bus stops,  bus routes and schedules.
-// There are different kinds of stops.  Bus stops in general will
+// There are different kinds of stops.  Bus stops in general
 // will appear on multiple routes.  A schedule will include
-// muliple trips on the same route.
+// multiple trips on the same route.

 /////////////////////////////////////////////////////////////
 // gps coordinate
 //
-// llustrates serialization for a simple type
+// illustrates serialization for a simple type
 //
 class gps_position
 {
@@ -57,13 +57,13 @@ class gps_position
 public:
    // every serializable class needs a constructor
    gps_position(){};
-    gps_position(int _d, int _m, float _s) : 
+    gps_position(int _d, int _m, float _s) :
        degrees(_d), minutes(_m), seconds(_s)
    {}
 };
 std::ostream & operator<<(std::ostream &os, const gps_position &gp)
 {
-    return os << ' ' << gp.degrees << (unsigned char)186 << gp.minutes << '\'' << gp.seconds << '"';
+    return os << ' ' << gp.degrees << (unsigned char)176 << gp.minutes << '\'' << gp.seconds << '"';
 }

 /////////////////////////////////////////////////////////////
@@ -147,7 +147,7 @@ class bus_stop_destination : public bus_stop
        ar & boost::serialization::base_object<bus_stop>(*this) & name;
    }
 public:
-    
+
    bus_stop_destination(){}
    bus_stop_destination(
        const gps_position & _lat, const gps_position & _long, const std::string & _name
@@ -162,7 +162,7 @@ public:
 //
 // illustrates serialization of STL collection templates.
 //
-// illustrates serialzation of polymorphic pointer (bus stop *);
+// illustrates serialization of polymorphic pointer (bus stop *);
 //
 // illustrates storage and recovery of shared pointers is correct
 // and efficient.  That is objects pointed to by more than one
@@ -202,7 +202,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
    // note: we're displaying the pointer to permit verification
    // that duplicated pointers are properly restored.
    for(it = br.stops.begin(); it != br.stops.end(); it++){
-        os << '\n' << std::hex << "0x" << *it << std::dec << ' ' << **it;
+        os << '\n' << "0x" << std::hex << reinterpret_cast<boost::uintptr_t>(*it) << std::dec << ' ' << **it;
    }
    return os;
 }
@@ -213,7 +213,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
 // Illustrates serialization of STL objects(pair) in a non-intrusive way.
 // See definition of operator<< <pair<F, S> >(ar, pair) and others in
 // serialization.hpp
-// 
+//
 // illustrates nesting of serializable classes
 //
 // illustrates use of version number to automatically grandfather older
@@ -233,7 +233,7 @@ public:
            if(file_version >= 2)
                // read the drivers name
                ar & driver;
-            // all versions have the follwing info
+            // all versions have the following info
            ar & hour & minute;
        }

@@ -299,7 +299,7 @@ restore_schedule(bus_schedule &s, const char * filename)
 }

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

@@ -326,7 +326,7 @@ int main(int argc, char *argv[])
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
    original_schedule.append("bob", 9, 57, &route0);
    original_schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make another route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
    // display the complete schedule
    std::cout << "original schedule";
    std::cout << original_schedule;
-    
+
    std::string filename(boost::archive::tmpdir());
    filename += "/demofile.txt";

@@ -359,7 +359,7 @@ int main(int argc, char *argv[])
    save_schedule(original_schedule, filename.c_str());

    // ... some time later
-    // make  a new schedule
+    // make a new schedule
    bus_schedule new_schedule;

    restore_schedule(new_schedule, filename.c_str());
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_auto_ptr.cpp

-// (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
+// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com .
+// 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)

 #include <list>
@@ -14,7 +14,7 @@
 #include <cstdio> // remove, std::autoptr inteface wrong in dinkumware
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
+namespace std{
    using ::remove;
 }
 #endif
@@ -25,7 +25,7 @@ namespace std{

 #include <boost/serialization/split_free.hpp>

-namespace boost { 
+namespace boost {
 namespace serialization {

 /////////////////////////////////////////////////////////////
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // A.hpp    simple class test

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -25,7 +25,7 @@
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{
-    using ::rand; 
+    using ::rand;
    using ::fabs;
    using ::size_t;
 }
@@ -61,7 +61,7 @@ private:
        ar & BOOST_SERIALIZATION_NVP(f);
        ar & BOOST_SERIALIZATION_NVP(g);
        #endif
-        #if BOOST_WORKAROUND(__BORLANDC__,  <= 0x551 )
+        #if BOOST_WORKAROUND(BOOST_BORLANDC,  <= 0x551 )
            int i;
            if(BOOST_DEDUCED_TYPENAME Archive::is_saving::value){
                i = l;
@@ -229,12 +229,12 @@ inline bool A::operator==(const A &rhs) const
    if(o != rhs.o)
        return false;
    if(p != rhs.p)
-        return false; 
+        return false;
    if(q != rhs.q)
        return false;
    #ifndef BOOST_NO_CWCHAR
    if(r != rhs.r)
-        return false; 
+        return false;
    #endif
    if(c != rhs.c)
        return false;
@@ -243,9 +243,9 @@ inline bool A::operator==(const A &rhs) const
    if(t != rhs.t)
        return false;
    if(u != rhs.u)
-        return false; 
+        return false;
    if(v != rhs.v)
-        return false; 
+        return false;
    if(std::abs( boost::math::float_distance(w, rhs.w)) > 1)
        return false;
    if(std::abs( boost::math::float_distance(x, rhs.x)) > 1)
@@ -255,7 +255,7 @@ inline bool A::operator==(const A &rhs) const
    #ifndef BOOST_NO_STD_WSTRING
    if(0 != z.compare(rhs.z))
        return false;
-    #endif      
+    #endif
    return true;
 }

@@ -297,11 +297,11 @@ inline bool A::operator<(const A &rhs) const
    if(t != rhs.t )
        return t < rhs.t;
    if(u != rhs.u )
-        return u < rhs.u; 
+        return u < rhs.u;
    if(v != rhs.v )
        return v < rhs.v;
    if(w != rhs.w )
-        return w < rhs.w; 
+        return w < rhs.w;
    if(x != rhs.x )
        return x < rhs.x;
    int i = y.compare(rhs.y);
@@ -10,8 +10,8 @@
 // A.hpp    simple class test

 // (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
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -60,7 +60,7 @@ private:
        ar & BOOST_SERIALIZATION_NVP(f);
        ar & BOOST_SERIALIZATION_NVP(g);
        #endif
-        #if BOOST_WORKAROUND(__BORLANDC__,  <= 0x551 )
+        #if BOOST_WORKAROUND(BOOST_BORLANDC,  <= 0x551 )
            int i;
            if(BOOST_DEDUCED_TYPENAME Archive::is_saving::value){
                i = l;
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // B.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -22,7 +22,7 @@
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
 namespace std{
-    using ::rand; 
+    using ::rand;
 }
 #endif

@@ -101,10 +101,10 @@ inline bool B::operator==(const B &rhs) const
 {
    return
        A::operator==(rhs)
-        && s == rhs.s 
-        && t == rhs.t 
-        && u == rhs.u 
-        && v == rhs.v 
+        && s == rhs.s
+        && 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
    ;
@@ -10,8 +10,8 @@
 // B.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
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -1,20 +1,20 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_exception.cpp

-// (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
+// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com .
+// 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)

 // Example of safe exception handling for pointer de-serialization
-// 
-// This example was prepared by Robert Ramey to demonstrate and test 
+//
+// This example was prepared by Robert Ramey to demonstrate and test
 // safe exception handling during the de-serialization of pointers in
 // a non-trivial example.
 //
 // Hopefully, this addresses exception issues raised by
 // Vahan Margaryan who spent considerable time and effort
-// in the analysis and testing of issues of exception safety 
+// in the analysis and testing of issues of exception safety
 // of the serialization library.

 #include <algorithm>
@@ -26,7 +26,7 @@
 #include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
+namespace std{
    using ::remove;
 }
 #endif
@@ -127,7 +127,7 @@ private:
 // case 1:
 template<class Archive>
 void School::serialize(Archive & ar, const unsigned int /* file_version */){
-    // if an exeception occurs while loading courses
+    // if an exception occurs while loading courses
    // the structure courses may have some courses each
    // with students
    ar & all_courses;
@@ -155,7 +155,7 @@ void School::save(Archive & ar, const unsigned int /* file_version */) const {

 template<class Archive>
 void School::load(Archive & ar, const unsigned int /* file_version */){
-    // if an exeception occurs while loading courses
+    // if an exception occurs while loading courses
    // the structure courses may have some courses each
    // with students
    try{
@@ -167,7 +167,7 @@ void School::load(Archive & ar, const unsigned int /* file_version */){
        ar >> all_students; // create students that have no courses
    }
    catch(std::exception){
-        // elminate any dangling references
+        // eliminate any dangling references
        all_courses.clear();
        all_students.clear();
        throw;
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_fast_binary_archive.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 // should pass compilation and execution
@@ -27,19 +27,19 @@
 using namespace boost::archive;

 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// "Fast" output binary archive.  This is a variation of the native binary 
+// "Fast" output binary archive.  This is a variation of the native binary
 class fast_binary_oarchive :
    // don't derive from binary_oarchive !!!
    public binary_oarchive_impl<
-        fast_binary_oarchive, 
-        std::ostream::char_type, 
+        fast_binary_oarchive,
+        std::ostream::char_type,
        std::ostream::traits_type
    >
 {
    typedef fast_binary_oarchive derived_t;
    typedef binary_oarchive_impl<
-        fast_binary_oarchive, 
-        std::ostream::char_type, 
+        fast_binary_oarchive,
+        std::ostream::char_type,
        std::ostream::traits_type
    > base_t;
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -48,15 +48,15 @@ public:
    friend class boost::archive::detail::interface_oarchive<derived_t>;
    friend class basic_binary_oarchive<derived_t>;
    friend class basic_binary_oprimitive<
-        derived_t, 
-        std::ostream::char_type, 
+        derived_t,
+        std::ostream::char_type,
        std::ostream::traits_type
    >;
    friend class boost::archive::save_access;
 #endif
    // add base class to the places considered when matching
    // save function to a specific set of arguments.  Note, this didn't
-    // work on my MSVC 7.0 system using 
+    // work on my MSVC 7.0 system using
    // binary_oarchive_impl<derived_t>::load_override;
    // so we use the sure-fire method below.  This failed to work as well
    template<class T>
@@ -95,19 +95,19 @@ public:
 BOOST_SERIALIZATION_REGISTER_ARCHIVE(fast_binary_oarchive)

 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// "Fast" input binary archive.  This is a variation of the native binary 
+// "Fast" input binary archive.  This is a variation of the native binary
 class fast_binary_iarchive :
    // don't derive from binary_oarchive !!!
    public binary_iarchive_impl<
-        fast_binary_iarchive, 
-        std::istream::char_type, 
+        fast_binary_iarchive,
+        std::istream::char_type,
        std::istream::traits_type
    >
 {
    typedef fast_binary_iarchive derived_t;
    typedef binary_iarchive_impl<
-        fast_binary_iarchive, 
-        std::istream::char_type, 
+        fast_binary_iarchive,
+        std::istream::char_type,
        std::istream::traits_type
    > base_t;
 #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -116,15 +116,15 @@ public:
    friend class boost::archive::detail::interface_iarchive<derived_t>;
    friend class basic_binary_iarchive<derived_t>;
    friend class basic_binary_iprimitive<
-        derived_t, 
-        std::ostream::char_type, 
+        derived_t,
+        std::ostream::char_type,
        std::ostream::traits_type
    >;
    friend class boost::archive::load_access;
 #endif
    // add base class to the places considered when matching
    // save function to a specific set of arguments.  Note, this didn't
-    // work on my MSVC 7.0 system using 
+    // work on my MSVC 7.0 system using
    // binary_oarchive_impl<derived_t>::load_override;
    // so we use the sure-fire method below.  This failed to work as well
    template<class T>
@@ -166,7 +166,7 @@ int main( int argc, char* argv[] )
    int a1[3] = {4, 5, 6};

    std::stringstream ss;
-    {   
+    {
        fast_binary_oarchive pboa(ss);
        pboa << a;
    }
@@ -6,14 +6,15 @@
 // demo_gps.hpp
 //
 // (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
+// 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)

 #include <iomanip>
 #include <iostream>
 #include <fstream>

+#include <boost/cstdint.hpp>
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/utility.hpp>
@@ -23,14 +24,14 @@

 // This illustration models the bus system of a small city.
 // This includes, multiple bus stops,  bus routes and schedules.
-// There are different kinds of stops.  Bus stops in general will
+// There are different kinds of stops.  Bus stops in general
 // will appear on multiple routes.  A schedule will include
-// muliple trips on the same route.
+// multiple trips on the same route.

 /////////////////////////////////////////////////////////////
 // gps coordinate
 //
-// llustrates serialization for a simple type
+// illustrates serialization for a simple type
 //
 class gps_position
 {
@@ -51,14 +52,14 @@ class gps_position
 public:
    // every serializable class needs a constructor
    gps_position(){};
-    gps_position(int _d, int _m, float _s) : 
+    gps_position(int _d, int _m, float _s) :
        degrees(_d), minutes(_m), seconds(_s)
    {}
 };

 std::ostream & operator<<(std::ostream &os, const gps_position &gp)
 {
-    return os << ' ' << gp.degrees << (unsigned char)186 << gp.minutes << '\'' << gp.seconds << '"';
+    return os << ' ' << gp.degrees << (unsigned char)176 << gp.minutes << '\'' << gp.seconds << '"';
 }

 /////////////////////////////////////////////////////////////
@@ -159,7 +160,7 @@ public:
 //
 // illustrates serialization of STL collection templates.
 //
-// illustrates serialzation of polymorphic pointer (bus stop *);
+// illustrates serialization of polymorphic pointer (bus stop *);
 //
 // illustrates storage and recovery of shared pointers is correct
 // and efficient.  That is objects pointed to by more than one
@@ -199,7 +200,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
    // note: we're displaying the pointer to permit verification
    // that duplicated pointers are properly restored.
    for(it = br.stops.begin(); it != br.stops.end(); it++){
-        os << '\n' << std::hex << "0x" << *it << std::dec << ' ' << **it;
+        os << '\n' << "0x" << std::hex << reinterpret_cast<boost::uintptr_t>(*it) << std::dec << ' ' << **it;
    }
    return os;
 }
@@ -209,7 +210,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
 //
 // Illustrates serialization of STL objects(pair) in a non-intrusive way.
 // See definition of operator<< <pair<F, S> >(ar, pair)
-// 
+//
 // illustrates nesting of serializable classes
 //
 // illustrates use of version number to automatically grandfather older
@@ -236,7 +237,7 @@ public:
            if(file_version >= 2)
                // read the drivers name
                ar & BOOST_SERIALIZATION_NVP(driver);
-            // all versions have the follwing info
+            // all versions have the following info
            ar  & BOOST_SERIALIZATION_NVP(hour)
                & BOOST_SERIALIZATION_NVP(minute);
        }
@@ -3,8 +3,8 @@
 // demo_log.cpp
 //
 // (C) Copyright 2009 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
+// 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)

 #include <iostream>
@@ -40,7 +40,7 @@ int main(int argc, char *argv[]){
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]){
    schedule.append("bob", 9, 57, &route0);
    schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make another route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_pimpl.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 // should pass compilation and execution
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_pimpl_A.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 #include <boost/archive/text_iarchive.hpp>
@@ -31,15 +31,15 @@ template<class Archive>
 void A::serialize(Archive & ar, const unsigned int /* file_version */){
    ar & pimpl;
 }
- 
-// without the explicit instantiations below, the program will
-// fail to link for lack of instantiantiation of the above function
+
+// without the explicit instantiation below, the program will
+// fail to link for lack of instantiation of the above function
 // note: the following failed to fix link errors for vc 7.0 !
 template void A::serialize<boost::archive::text_iarchive>(
-    boost::archive::text_iarchive & ar, 
+    boost::archive::text_iarchive & ar,
    const unsigned int file_version
 );
 template void A::serialize<boost::archive::text_oarchive>(
-    boost::archive::text_oarchive & ar, 
+    boost::archive::text_oarchive & ar,
    const unsigned int file_version
 );
@@ -4,9 +4,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_pimpl_A.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 // class whose declaration is hidden by a pointer
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_polymorphic.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 // should pass compilation and execution
@@ -26,10 +26,10 @@ int main(int argc, char* argv[])
        // test with a text archive
        std::stringstream ss;
        {
-            // instantiate archive which inhertis polymorphic interface
+            // instantiate archive which inherits polymorphic interface
            // and the normal text archive implementation
            boost::archive::polymorphic_text_oarchive oa(ss);
-            boost::archive::polymorphic_oarchive & oa_interface = oa; 
+            boost::archive::polymorphic_oarchive & oa_interface = oa;
            // we can just just the interface for saving
            oa_interface << a;
        }
@@ -45,7 +45,7 @@ int main(int argc, char* argv[])
        //test with a binary archive
        std::stringstream ss;
        {
-            // instantiate archive which inhertis polymorphic interface
+            // instantiate archive which inherits polymorphic interface
            // and the normal binary archive implementation
            boost::archive::polymorphic_binary_oarchive oa(ss);
            oa << a;
@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
        {
            // see above
            boost::archive::polymorphic_binary_iarchive ia(ss);
-            boost::archive::polymorphic_iarchive & ia_interface = ia; 
+            boost::archive::polymorphic_iarchive & ia_interface = ia;
            // use just the polymorphic interface for loading.
            ia_interface >> a1;
        }
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_polymorphic_A.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)


@@ -16,11 +16,11 @@
 // used by this demo.
 template
 void A::serialize<boost::archive::polymorphic_iarchive>(
-    boost::archive::polymorphic_iarchive &, 
+    boost::archive::polymorphic_iarchive &,
    const unsigned int
 );
 template
 void A::serialize<boost::archive::polymorphic_oarchive>(
-    boost::archive::polymorphic_oarchive &, 
+    boost::archive::polymorphic_oarchive &,
    const unsigned int
 );
@@ -4,9 +4,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // demo_polymorphic_A.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 namespace boost {
@@ -22,7 +22,7 @@ struct A {
    // class a contains a pointer to a "hidden" declaration
    template<class Archive>
    void serialize(
-        Archive & ar, 
+        Archive & ar,
        const unsigned int file_version
    ){
        ar & data;
@@ -3,8 +3,8 @@
 // demo_portable_archive.cpp
 //
 // (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
+// 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)

 // should pass compilation and execution
@@ -43,8 +43,8 @@ public:
            c == rhs.c
            && i == rhs.i
            && i2 == rhs.i2
-            && ui == rhs.ui 
-            && l == rhs.l 
+            && ui == rhs.ui
+            && l == rhs.l
            && ul == rhs.ul
        ;
    }
@@ -65,7 +65,7 @@ int main( int /* argc */, char* /* argv */[] )
    A a1;

    std::stringstream ss;
-    {   
+    {
        portable_binary_oarchive pboa(ss);
        pboa << a;
    }
@@ -77,7 +77,7 @@ int main( int /* argc */, char* /* argv */[] )
        return 1;

    ss.clear();
-    {   
+    {
        portable_binary_oarchive pboa(ss, endian_big);
        pboa << a;
    }
@@ -89,7 +89,7 @@ int main( int /* argc */, char* /* argv */[] )
        return 1;

    ss.clear();
-    {   
+    {
        portable_binary_oarchive pboa(ss, endian_big);
        pboa << a;
    }
@@ -3,8 +3,8 @@
 // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . Polymorphic
 // derived pointer example by David Tonge.

-// Use, modification and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// 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)
 //
 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -18,7 +18,7 @@
 #include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
+namespace std{
    using ::remove;
 }
 #endif
@@ -3,8 +3,8 @@
 // demo_log.cpp
 //
 // (C) Copyright 2009 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
+// 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)

 #include <iostream>
@@ -14,7 +14,7 @@
 #include "simple_log_archive.hpp"

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

@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
    schedule.append("bob", 9, 57, &route0);
    schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make another route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -3,8 +3,8 @@
 // demo_trivial_archive.cpp
 //
 // (C) Copyright 2009 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
+// 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)

 #include <cstddef> // std::size_t
@@ -18,7 +18,7 @@ public:
    //////////////////////////////////////////////////////////
    // public interface used by programs that use the
    // serialization library
-    typedef boost::mpl::bool_<true> is_saving; 
+    typedef boost::mpl::bool_<true> is_saving;
    typedef boost::mpl::bool_<false> is_loading;
    template<class T> void register_type(){}
    template<class T> trivial_oarchive & operator<<(const T & t){
@@ -33,7 +33,7 @@ public:
 #include "demo_gps.hpp"

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

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
    schedule.append("bob", 9, 57, &route0);
    schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make another route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -3,8 +3,8 @@
 // demo_xml.cpp
 //
 // (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
+// 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)

 #include <iomanip>
@@ -15,7 +15,7 @@
 #include <cstdio> // remove
 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
+namespace std{
    using ::remove;
 }
 #endif
@@ -47,7 +47,7 @@ restore_schedule(bus_schedule &s, const char * filename)
 }

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

@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
    original_schedule.append("bob", 9, 57, &route0);
    original_schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make another route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
    // display the complete schedule
    std::cout << "original schedule";
    std::cout << original_schedule;
-    
+
    std::string filename(boost::archive::tmpdir());
    filename += "/demo.xml";

@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
    save_schedule(original_schedule, filename.c_str());

    // ... some time later
-    // make  a new schedule
+    // make a new schedule
    bus_schedule new_schedule;

    restore_schedule(new_schedule, filename.c_str());
@@ -6,8 +6,8 @@
 // demo_xml.hpp
 //
 // (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
+// 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)


@@ -16,6 +16,7 @@
 #include <iostream>
 #include <fstream>

+#include <boost/cstdint.hpp>
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/utility.hpp>
 #include <boost/serialization/list.hpp>
@@ -23,14 +24,14 @@

 // This illustration models the bus system of a small city.
 // This includes, multiple bus stops,  bus routes and schedules.
-// There are different kinds of stops.  Bus stops in general will
+// There are different kinds of stops.  Bus stops in general
 // will appear on multiple routes.  A schedule will include
-// muliple trips on the same route.
+// multiple trips on the same route.

 /////////////////////////////////////////////////////////////
 // gps coordinate
 //
-// llustrates serialization for a simple type
+// illustrates serialization for a simple type
 //
 class gps_position
 {
@@ -51,14 +52,14 @@ class gps_position
 public:
    // every serializable class needs a constructor
    gps_position(){};
-    gps_position(int _d, int _m, float _s) : 
+    gps_position(int _d, int _m, float _s) :
        degrees(_d), minutes(_m), seconds(_s)
    {}
 };

 std::ostream & operator<<(std::ostream &os, const gps_position &gp)
 {
-    return os << ' ' << gp.degrees << (unsigned char)186 << gp.minutes << '\'' << gp.seconds << '"';
+    return os << ' ' << gp.degrees << (unsigned char)176 << gp.minutes << '\'' << gp.seconds << '"';
 }

 /////////////////////////////////////////////////////////////
@@ -159,7 +160,7 @@ public:
 //
 // illustrates serialization of STL collection templates.
 //
-// illustrates serialzation of polymorphic pointer (bus stop *);
+// illustrates serialization of polymorphic pointer (bus stop *);
 //
 // illustrates storage and recovery of shared pointers is correct
 // and efficient.  That is objects pointed to by more than one
@@ -199,7 +200,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
    // note: we're displaying the pointer to permit verification
    // that duplicated pointers are properly restored.
    for(it = br.stops.begin(); it != br.stops.end(); it++){
-        os << '\n' << std::hex << "0x" << *it << std::dec << ' ' << **it;
+        os << '\n' << "0x" << std::hex << reinterpret_cast<boost::uintptr_t>(*it) << std::dec << ' ' << **it;
    }
    return os;
 }
@@ -209,7 +210,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br)
 //
 // Illustrates serialization of STL objects(pair) in a non-intrusive way.
 // See definition of operator<< <pair<F, S> >(ar, pair)
-// 
+//
 // illustrates nesting of serializable classes
 //
 // illustrates use of version number to automatically grandfather older
@@ -236,7 +237,7 @@ public:
            if(file_version >= 2)
                // read the drivers name
                ar & BOOST_SERIALIZATION_NVP(driver);
-            // all versions have the follwing info
+            // all versions have the following info
            ar  & BOOST_SERIALIZATION_NVP(hour)
                & BOOST_SERIALIZATION_NVP(minute);
        }
@@ -3,8 +3,8 @@
 // demo_xml_load.cpp
 //
 // (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
+// 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)

 #include <iostream>
@@ -28,7 +28,7 @@ restore_schedule(bus_schedule &s, const char * filename)
 }

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

@@ -3,8 +3,8 @@
 // demo_xml_save.cpp
 //
 // (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
+// 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)

 #include <iostream>
@@ -24,7 +24,7 @@ void save_schedule(const bus_schedule &s, const char * filename){
 }

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

@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
        "Lincoln Memorial"
    );

-    // make a  routes
+    // make a route
    bus_route route0;
    route0.append(bs0);
    route0.append(bs1);
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
    original_schedule.append("bob", 9, 57, &route0);
    original_schedule.append("alice", 11, 02, &route0);

-    // make aother routes
+    // make an other route
    bus_route route1;
    route1.append(bs3);
    route1.append(bs2);
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
    // display the complete schedule
    std::cout << "original schedule";
    std::cout << original_schedule;
-    
+
    std::string filename(boost::archive::tmpdir());
    filename += "/demo_save.xml";

@@ -1,3 +1,11 @@
+/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
+// fix_six.cpp
+
+// Copyright 2010 Robert Ramey
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// https://www.boost.org/LICENSE_1_0.txt)
+
 #include <fstream>
 #include <ios>
 #include <iostream>
@@ -17,7 +25,7 @@ int main(int argc, char *argv[]){
    }
    std::filebuf fb;
    fb.open(
-        argv[1], 
+        argv[1],
        std::ios_base::binary | std::ios_base::in | std::ios_base::out
    );
    if(!fb.is_open()){
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // log_archive.cpp:

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // log_archive.hpp

-// (C) Copyright 2010 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
+// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -27,15 +27,15 @@ namespace boost {
 } // boost

 /////////////////////////////////////////////////////////////////////////
-// log data to an output stream.  This illustrates a simpler implemenation
+// log data to an output stream.  This illustrates a simpler implementation
 // of text output which is useful for getting a formatted display of
 // any serializable class.  Intended to be useful as a debugging aid.
 class log_archive :
-    /* protected ? */ 
+    /* protected ? */
    public boost::archive::xml_oarchive_impl<log_archive>
 {
    typedef boost::archive::xml_oarchive_impl<log_archive> base;
-    // give serialization implementation access to this clas
+    // give serialization implementation access to this class
    friend class boost::archive::detail::interface_oarchive<log_archive>;
    friend class boost::archive::basic_xml_oarchive<log_archive>;
    friend class boost::archive::save_access;
@@ -72,7 +72,7 @@ class log_archive :
 public:
    log_archive(std::ostream & os, unsigned int flags = 0) :
        boost::archive::xml_oarchive_impl<log_archive>(
-            os, 
+            os,
            flags | boost::archive::no_header
        )
    {}
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // polymorphic_portable_binary_iarchive.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -22,8 +22,8 @@ namespace boost {
 namespace archive {

 template class binary_iarchive_impl<
-    polymorphic_portable_binary_iarchive, 
-    std::istream::char_type, 
+    polymorphic_portable_binary_iarchive,
+    std::istream::char_type,
    std::istream::traits_type
 >;
 template class detail::archive_pointer_iserializer<
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // polymorphic_portable_binary_iarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // polymorphic_portable_binary_oarchive.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -23,8 +23,8 @@ namespace archive {

 // explicitly instantiate for this type of binary stream
 template class binary_oarchive_impl<
-    polymorphic_portable_binary_oarchive, 
-    std::ostream::char_type, 
+    polymorphic_portable_binary_oarchive,
+    std::ostream::char_type,
    std::ostream::traits_type
 >;
 template class detail::archive_pointer_oserializer<
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // polymorphic_portable_binary_oarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -1,9 +1,9 @@
 #ifndef PORTABLE_BINARY_ARCHIVE_HPP
 #define PORTABLE_BINARY_ARCHIVE_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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 // MS compatible compilers support #pragma once
@@ -21,7 +21,7 @@
 #endif

 #include <boost/archive/basic_archive.hpp>
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>

 enum portable_binary_archive_flags {
    endian_big        = 0x4000,
@@ -1,9 +1,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_iarchive.cpp

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -11,13 +11,13 @@
 #include <istream>
 #include <string>

-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
 #include <boost/serialization/throw_exception.hpp>
 #include <boost/archive/archive_exception.hpp>

 #include "portable_binary_iarchive.hpp"

-void 
+void
 portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
    char size;
    l = 0;
@@ -37,18 +37,18 @@ portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){
        );

    char * cptr = reinterpret_cast<char *>(& l);
-    #ifdef BOOST_BIG_ENDIAN
+    #if BOOST_ENDIAN_BIG_BYTE
        cptr += (sizeof(boost::intmax_t) - size);
    #endif
    this->primitive_base_t::load_binary(cptr, size);

-    #ifdef BOOST_BIG_ENDIAN
+    #if BOOST_ENDIAN_BIG_BYTE
        if(m_flags & endian_little)
    #else
        if(m_flags & endian_big)
    #endif
    reverse_bytes(size, cptr);
-    
+
    if(negative)
        l = -l;
 }
@@ -70,7 +70,7 @@ portable_binary_iarchive::load_override(
    t.t[cn.size()] = '\0';
 }

-void 
+void
 portable_binary_iarchive::init(unsigned int flags){
    if(0 == (flags & boost::archive::no_header)){
        // read signature in an archive version independent manner
@@ -94,7 +94,7 @@ portable_binary_iarchive::init(unsigned int flags){
                    boost::archive::archive_exception::unsupported_version
                )
            );
-        
+
        #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
        this->set_library_version(input_library_version);
        //#else
@@ -123,7 +123,7 @@ namespace detail {

 template class basic_binary_iprimitive<
    portable_binary_iarchive,
-    std::istream::char_type, 
+    std::istream::char_type,
    std::istream::traits_type
 > ;

@@ -14,9 +14,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_iarchive.hpp

-// (C) Copyright 2002-7 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
+// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -34,7 +34,7 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // exception to be thrown if integer read from archive doesn't fit
 // variable being loaded
-class portable_binary_iarchive_exception : 
+class portable_binary_iarchive_exception :
    public boost::archive::archive_exception
 {
 public:
@@ -62,13 +62,13 @@ public:
 };

 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// "Portable" input binary archive.  It addresses integer size and endienness so 
+// "Portable" input binary archive.  It addresses integer size and endianness so
 // that binary archives can be passed across systems. Note:floating point types
 // not addressed here
 class portable_binary_iarchive :
    public boost::archive::basic_binary_iprimitive<
        portable_binary_iarchive,
-        std::istream::char_type, 
+        std::istream::char_type,
        std::istream::traits_type
    >,
    public boost::archive::detail::common_iarchive<
@@ -77,7 +77,7 @@ class portable_binary_iarchive :
    {
    typedef boost::archive::basic_binary_iprimitive<
        portable_binary_iarchive,
-        std::istream::char_type, 
+        std::istream::char_type,
        std::istream::traits_type
    > primitive_base_t;
    typedef boost::archive::detail::common_iarchive<
@@ -148,21 +148,21 @@ protected:
    void load(unsigned char & t){
        this->primitive_base_t::load(t);
    }
-    typedef boost::archive::detail::common_iarchive<portable_binary_iarchive> 
+    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(boost::archive::class_name_type & t);
-    // binary files don't include the optional information 
+    // binary files don't include the optional information
    void load_override(boost::archive::class_id_optional_type &){}

    void init(unsigned int flags);
 public:
    portable_binary_iarchive(std::istream & is, unsigned flags = 0) :
        primitive_base_t(
-            * is.rdbuf(), 
+            * is.rdbuf(),
            0 != (flags & boost::archive::no_codecvt)
        ),
        archive_base_t(flags),
@@ -173,13 +173,13 @@ public:

    portable_binary_iarchive(
        std::basic_streambuf<
-            std::istream::char_type, 
+            std::istream::char_type,
            std::istream::traits_type
-        > & bsb, 
+        > & bsb,
        unsigned int flags
    ) :
        primitive_base_t(
-            bsb, 
+            bsb,
            0 != (flags & boost::archive::no_codecvt)
        ),
        archive_base_t(flags),
@@ -1,18 +1,18 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_oarchive.cpp

-// (C) Copyright 2002-7 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
+// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.

 #include <ostream>
-#include <boost/detail/endian.hpp>
+#include <boost/predef/other/endian.h>
 #include "portable_binary_oarchive.hpp"

-void 
+void
 portable_binary_oarchive::save_impl(
    const boost::intmax_t l,
    const char maxsize
@@ -45,7 +45,7 @@ portable_binary_oarchive::save_impl(
    else
        ll = l;
    char * cptr = reinterpret_cast<char *>(& ll);
-    #ifdef BOOST_BIG_ENDIAN
+    #if BOOST_ENDIAN_BIG_BYTE
        cptr += (sizeof(boost::intmax_t) - size);
        if(m_flags & endian_little)
            reverse_bytes(size, cptr);
@@ -56,7 +56,7 @@ portable_binary_oarchive::save_impl(
    this->primitive_base_t::save_binary(cptr, size);
 }

-void 
+void
 portable_binary_oarchive::init(unsigned int flags) {
    if(m_flags == (endian_big | endian_little)){
        boost::serialization::throw_exception(
@@ -90,7 +90,7 @@ namespace detail {

 template class basic_binary_oprimitive<
    portable_binary_oarchive,
-    std::ostream::char_type, 
+    std::ostream::char_type,
    std::ostream::traits_type
 > ;

@@ -14,9 +14,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // portable_binary_oarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -33,12 +33,12 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // exception to be thrown if integer read from archive doesn't fit
 // variable being loaded
-class portable_binary_oarchive_exception : 
+class portable_binary_oarchive_exception :
    public boost::archive::archive_exception
 {
 public:
    typedef enum {
-        invalid_flags 
+        invalid_flags
    } exception_code;
    portable_binary_oarchive_exception(exception_code c = invalid_flags )
    {}
@@ -56,14 +56,14 @@ public:
 };

 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
-// "Portable" output binary archive.  This is a variation of the native binary 
-// archive. it addresses integer size and endienness so that binary archives can
+// "Portable" output binary archive.  This is a variation of the native binary
+// archive. it addresses integer size and endianness so that binary archives can
 // be passed across systems. Note:floating point types not addressed here

 class portable_binary_oarchive :
    public boost::archive::basic_binary_oprimitive<
        portable_binary_oarchive,
-        std::ostream::char_type, 
+        std::ostream::char_type,
        std::ostream::traits_type
    >,
    public boost::archive::detail::common_oarchive<
@@ -72,7 +72,7 @@ class portable_binary_oarchive :
 {
    typedef boost::archive::basic_binary_oprimitive<
        portable_binary_oarchive,
-        std::ostream::char_type, 
+        std::ostream::char_type,
        std::ostream::traits_type
    > primitive_base_t;
    typedef boost::archive::detail::common_oarchive<
@@ -128,7 +128,7 @@ protected:

    // default processing - kick back to base class.  Note the
    // extra stuff to get it passed borland compilers
-    typedef boost::archive::detail::common_oarchive<portable_binary_oarchive> 
+    typedef boost::archive::detail::common_oarchive<portable_binary_oarchive>
        detail_common_oarchive;
    template<class T>
    void save_override(T & t){
@@ -139,7 +139,7 @@ protected:
        const std::string s(t);
        * this << s;
    }
-    // binary files don't include the optional information 
+    // binary files don't include the optional information
    void save_override(
        const boost::archive::class_id_optional_type & /* t */
    ){}
@@ -159,13 +159,13 @@ public:

    portable_binary_oarchive(
        std::basic_streambuf<
-            std::ostream::char_type, 
+            std::ostream::char_type,
            std::ostream::traits_type
-        > & bsb, 
+        > & bsb,
        unsigned int flags
    ) :
        primitive_base_t(
-            bsb, 
+            bsb,
            0 != (flags & boost::archive::no_codecvt)
        ),
        archive_base_t(flags),
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // simple_log_archive.hpp

-// (C) Copyright 2010 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
+// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com .
+// 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)

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

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::size_t; 
+namespace std{
+    using ::size_t;
 } // namespace std
 #endif

@@ -37,7 +37,7 @@ namespace std{
 #include <boost/serialization/access.hpp>

 /////////////////////////////////////////////////////////////////////////
-// log data to an output stream.  This illustrates a simpler implemenation
+// log data to an output stream.  This illustrates a simpler implementation
 // of text output which is useful for getting a formatted display of
 // any serializable class.  Intended to be useful as a debugging aid.
 class simple_log_archive {
@@ -65,15 +65,15 @@ class simple_log_archive {
            // make sure call is routed through the highest interface that might
            // be specialized by the user.
            boost::serialization::serialize_adl(
-                ar, 
-                const_cast<T &>(t), 
+                ar,
+                const_cast<T &>(t),
                ::boost::serialization::version< T >::value
            );
        }
    };
    template<class T>
    void save(const T &t){
-        typedef 
+        typedef
            BOOST_DEDUCED_TYPENAME boost::mpl::eval_if<boost::is_enum< T >,
                boost::mpl::identity<save_enum_type<simple_log_archive> >,
            //else
@@ -88,10 +88,10 @@ class simple_log_archive {
                boost::mpl::identity<save_only<simple_log_archive> >
            > >::type typex;
        typex::invoke(*this, t);
-    }    
+    }
    #ifndef BOOST_NO_STD_WSTRING
    void save(const std::wstring &ws){
-        m_os << "wide string types not suported in log archive";
+        m_os << "wide string types not supported in log archive";
    }
    #endif

@@ -110,12 +110,12 @@ public:
        return 0;
    }

-    void 
+    void
    save_binary(const void *address, std::size_t count){
        m_os << "save_binary not implemented";
    }

-    // the << operators 
+    // the << operators
    template<class T>
    simple_log_archive & operator<<(T const & t){
        m_os << ' ';
@@ -151,7 +151,7 @@ public:
        return * this;
    }

-    // the & operator 
+    // the & operator
    template<class T>
    simple_log_archive & operator&(const T & t){
            return * this << t;
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // archive/archive_exception.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -20,16 +20,16 @@
 #include <boost/assert.hpp>
 #include <string>

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

 // note: the only reason this is in here is that windows header
 // includes #define exception_code _exception_code (arrrgghhhh!).
 // the most expedient way to address this is be sure that this
 // header is always included whenever this header file is included.
-#if defined(BOOST_WINDOWS) 
-#include <excpt.h> 
-#endif 
+#if defined(BOOST_WINDOWS)
+#include <excpt.h>
+#endif

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

@@ -39,7 +39,7 @@ namespace archive {
 //////////////////////////////////////////////////////////////////////
 // exceptions thrown by archives
 //
-class BOOST_SYMBOL_VISIBLE archive_exception : 
+class BOOST_SYMBOL_VISIBLE archive_exception :
    public virtual std::exception
 {
 private:
@@ -52,7 +52,7 @@ protected:
 public:
    typedef enum {
        no_exception,       // initialized without code
-        other_exception,    // any excepton not listed below
+        other_exception,    // any exception not listed below
        unregistered_class, // attempt to serialize a pointer of
                            // an unregistered class
        invalid_signature,  // first line of archive does not contain
@@ -61,9 +61,9 @@ 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 
-                            // in the creation of an extra copy of the obect.
+                            // already been serialized through a pointer.
+                            // Were this permitted, the archive load would result
+                            // in the creation of an extra copy of the 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
@@ -71,9 +71,9 @@ public:
        invalid_class_name, // class name greater than the maximum permitted.
                            // most likely a corrupted archive or an attempt
                            // to insert virus via buffer overrun method.
-        unregistered_cast,   // base - derived relationship not registered with 
+        unregistered_cast,   // base - derived relationship not registered with
                            // void_cast_register
-        unsupported_class_version, // type saved with a version # greater than the 
+        unsupported_class_version, // type saved with a version # greater than the
                            // one used by the program.  This indicates that the program
                            // needs to be rebuilt.
        multiple_code_instantiation, // code for implementing serialization for some
@@ -83,13 +83,13 @@ public:
    exception_code code;

    BOOST_ARCHIVE_DECL archive_exception(
-        exception_code c, 
+        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 ;
+    BOOST_ARCHIVE_DECL archive_exception(archive_exception const &) BOOST_NOEXCEPT;
+    BOOST_ARCHIVE_DECL ~archive_exception() BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE;
+    BOOST_ARCHIVE_DECL const char * what() const BOOST_NOEXCEPT_OR_NOTHROW BOOST_OVERRIDE;
 };

 }// namespace archive
@@ -9,18 +9,18 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_archive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  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
-#include <boost/noncopyable.hpp>
 #include <boost/integer_traits.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/serialization/library_version_type.hpp>

 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
@@ -33,76 +33,43 @@ namespace archive {
 #pragma warning( disable : 4244 4267 )
 #endif

-/* NOTE : Warning  : Warning : Warning : Warning : Warning
- * Don't ever changes this.  If you do, they previously created
- * binary archives won't be readable !!!
- */
-class library_version_type {
-private:
-    typedef uint_least16_t base_type;
-    base_type t;
-public:
-    library_version_type(): t(0) {};
-    explicit library_version_type(const unsigned int & t_) : t(t_){
-        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
-    }
-    library_version_type(const library_version_type & t_) : 
-        t(t_.t)
-    {}
-    library_version_type & operator=(const library_version_type & rhs){
-        t = rhs.t; 
-        return *this;
-    }
-    // used for text output
-    operator base_type () const {
-        return t;
-    }                
-    // used for text input
-    operator base_type & (){
-        return t;
-    }                
-    bool operator==(const library_version_type & rhs) const {
-        return t == rhs.t;
-    } 
-    bool operator<(const library_version_type & rhs) const {
-        return t < rhs.t;
-    }   
-};
-
-BOOST_ARCHIVE_DECL library_version_type
+BOOST_ARCHIVE_DECL boost::serialization::library_version_type
 BOOST_ARCHIVE_VERSION();

+// create alias in boost::archive for older user code.
+typedef boost::serialization::library_version_type library_version_type;
+
 class version_type {
 private:
    typedef uint_least32_t base_type;
    base_type t;
 public:
    // should be private - but MPI fails if it's not!!!
-    version_type(): t(0) {};
+    version_type(): t(0) {}
    explicit version_type(const unsigned int & t_) : t(t_){
        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
    }
-    version_type(const version_type & t_) : 
+    version_type(const version_type & t_) :
        t(t_.t)
    {}
    version_type & operator=(const version_type & rhs){
-        t = rhs.t; 
+        t = rhs.t;
        return *this;
    }
    // used for text output
    operator base_type () const {
        return t;
-    }                
-    // used for text intput
+    }
+    // used for text input
    operator base_type  & (){
        return t;
-    }                
+    }
    bool operator==(const version_type & rhs) const {
        return t == rhs.t;
-    } 
+    }
    bool operator<(const version_type & rhs) const {
        return t < rhs.t;
-    }   
+    }
 };

 class class_id_type {
@@ -111,70 +78,73 @@ private:
    base_type t;
 public:
    // should be private - but then can't use BOOST_STRONG_TYPE below
-    class_id_type() : t(0) {};
+    class_id_type() : t(0) {}
    explicit class_id_type(const int t_) : t(t_){
        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
    }
    explicit class_id_type(const std::size_t t_) : t(t_){
 //       BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
    }
-    class_id_type(const class_id_type & t_) : 
+    class_id_type(const class_id_type & t_) :
        t(t_.t)
    {}
    class_id_type & operator=(const class_id_type & rhs){
-        t = rhs.t; 
+        t = rhs.t;
        return *this;
    }

    // used for text output
-    operator int () const {
+    operator base_type () const {
        return t;
-    }                
+    }
    // used for text input
-    operator int_least16_t &() {
+    operator base_type &() {
        return t;
-    }                
+    }
    bool operator==(const class_id_type & rhs) const {
        return t == rhs.t;
-    } 
+    }
    bool operator<(const class_id_type & rhs) const {
        return t < rhs.t;
-    }   
+    }
 };

-#define NULL_POINTER_TAG boost::archive::class_id_type(-1)
+#define BOOST_SERIALIZATION_NULL_POINTER_TAG boost::archive::class_id_type(-1)

 class object_id_type {
 private:
    typedef uint_least32_t base_type;
    base_type t;
 public:
-    object_id_type(): t(0) {};
+    object_id_type(): t(0) {}
    // note: presumes that size_t >= unsigned int.
-    explicit object_id_type(const std::size_t & t_) : t(t_){
+    // use explicit cast to silence useless warning
+    explicit object_id_type(const std::size_t & t_) : t(static_cast<base_type>(t_)){
+        // make quadruple sure that we haven't lost any real integer
+        // precision
        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
    }
-    object_id_type(const object_id_type & t_) : 
+    object_id_type(const object_id_type & t_) :
        t(t_.t)
    {}
    object_id_type & operator=(const object_id_type & rhs){
-        t = rhs.t; 
+        t = rhs.t;
        return *this;
    }
    // used for text output
-    operator uint_least32_t () const {
+    operator base_type () const {
        return t;
-    }                
+    }
    // used for text input
-    operator uint_least32_t & () {
+    operator base_type & () {
        return t;
-    }                
+    }
    bool operator==(const object_id_type & rhs) const {
        return t == rhs.t;
-    } 
+    }
    bool operator<(const object_id_type & rhs) const {
        return t < rhs.t;
-    }   
+    }
 };

 #if defined(_MSC_VER)
@@ -185,16 +155,16 @@ struct tracking_type {
    bool t;
    explicit tracking_type(const bool t_ = false)
        : t(t_)
-    {};
+    {}
    tracking_type(const tracking_type & t_)
        : t(t_.t)
    {}
    operator bool () const {
        return t;
-    };
+    }
    operator bool & () {
        return t;
-    };
+    }
    tracking_type & operator=(const bool t_){
        t = t_;
        return *this;
@@ -211,8 +181,8 @@ struct tracking_type {
    }
 };

-struct class_name_type : 
-    private boost::noncopyable 
+struct class_name_type :
+    private boost::noncopyable
 {
    char *t;
    operator const char * & () const {
@@ -224,9 +194,9 @@ struct class_name_type :
    std::size_t size() const {
        return std::strlen(t);
    }
-    explicit class_name_type(const char *key_) 
+    explicit class_name_type(const char *key_)
    : t(const_cast<char *>(key_)){}
-    explicit class_name_type(char *key_) 
+    explicit class_name_type(char *key_)
    : t(key_){}
    class_name_type & operator=(const class_name_type & rhs){
        t = rhs.t;
@@ -246,7 +216,7 @@ BOOST_ARCHIVE_DECL const char *
 BOOST_ARCHIVE_SIGNATURE();

 /* NOTE : Warning  : Warning : Warning : Warning : Warning
- * If any of these are changed to different sized types, 
+ * If any of these are changed to different sized types,
 * binary_iarchive won't be able to read older archives
 * unless you rev the library version and include conditional
 * code based on the library version.  There is nothing
@@ -276,7 +246,7 @@ BOOST_ARCHIVE_STRONG_TYPEDEF(object_id_type, object_reference_type)
 // set implementation level to primitive for all types
 // used internally by the serialization library

-BOOST_CLASS_IMPLEMENTATION(boost::archive::library_version_type, primitive_type)
+BOOST_CLASS_IMPLEMENTATION(boost::serialization::library_version_type, primitive_type)
 BOOST_CLASS_IMPLEMENTATION(boost::archive::version_type, primitive_type)
 BOOST_CLASS_IMPLEMENTATION(boost::archive::class_id_type, primitive_type)
 BOOST_CLASS_IMPLEMENTATION(boost::archive::class_id_reference_type, primitive_type)
@@ -288,10 +258,10 @@ BOOST_CLASS_IMPLEMENTATION(boost::archive::tracking_type, primitive_type)

 #include <boost/serialization/is_bitwise_serializable.hpp>

-// set types used internally by the serialization library 
+// set types used internally by the serialization library
 // to be bitwise serializable

-BOOST_IS_BITWISE_SERIALIZABLE(boost::archive::library_version_type)
+BOOST_IS_BITWISE_SERIALIZABLE(boost::serialization::library_version_type)
 BOOST_IS_BITWISE_SERIALIZABLE(boost::archive::version_type)
 BOOST_IS_BITWISE_SERIALIZABLE(boost::archive::class_id_type)
 BOOST_IS_BITWISE_SERIALIZABLE(boost::archive::class_id_reference_type)
@@ -10,15 +10,15 @@
 // basic_binary_iarchive.hpp
 //
 // archives stored as native binary - this should be the fastest way
-// to archive the state of a group of obects.  It makes no attempt to
+// to archive the state of a group of objects.  It makes no attempt to
 // convert to any canonical form.

 // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE
 // ON PLATFORM APART FROM THE ONE THEY ARE CREATED ON

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -30,6 +30,7 @@
 #include <boost/archive/detail/common_iarchive.hpp>
 #include <boost/serialization/collection_size_type.hpp>
 #include <boost/serialization/string.hpp>
+#include <boost/serialization/library_version_type.hpp>
 #include <boost/serialization/item_version_type.hpp>
 #include <boost/integer_traits.hpp>

@@ -40,7 +41,7 @@

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

-namespace boost { 
+namespace boost {
 namespace archive {

 namespace detail {
@@ -50,7 +51,7 @@ 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 BOOST_SYMBOL_VISIBLE basic_binary_iarchive :
    public detail::common_iarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -66,9 +67,9 @@ protected:
    #endif
 #endif
    // intermediate level to support override of operators
-    // fot templates in the absence of partial function 
+    // fot templates in the absence of partial function
    // template ordering. If we get here pass to base class
-    // note extra nonsense to sneak it pass the borland compiers
+    // note extra nonsense to sneak it pass the borland compilers
    typedef detail::common_iarchive<Archive> detail_common_iarchive;
    template<class T>
    void load_override(T & t){
@@ -84,12 +85,12 @@ protected:
    BOOST_STATIC_ASSERT(sizeof(object_id_type) == sizeof(uint_least32_t));
    BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t));

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

    void load_override(tracking_type & t, int /*version*/){
-        library_version_type lvt = this->get_library_version();
-        if(boost::archive::library_version_type(6) < lvt){
+        boost::serialization::library_version_type lv = this->get_library_version();
+        if(boost::serialization::library_version_type(6) < lv){
            int_least8_t x=0;
            * this->This() >> x;
            t = boost::archive::tracking_type(x);
@@ -101,18 +102,30 @@ protected:
        }
    }
    void load_override(class_id_type & t){
-        library_version_type lvt = this->get_library_version();
-        if(boost::archive::library_version_type(7) < lvt){
+        boost::serialization::library_version_type lv = this->get_library_version();
+        /*
+         * library versions:
+         *   boost 1.39 -> 5
+         *   boost 1.43 -> 7
+         *   boost 1.47 -> 9
+         *
+         *
+         * 1) in boost 1.43 and inferior, class_id_type is always a 16bit value, with no check on the library version
+         *   --> this means all archives with version v <= 7 are written with a 16bit class_id_type
+         * 2) in boost 1.44 this load_override has disappeared (and thus boost 1.44 is not backward compatible at all !!)
+         * 3) recent boosts reintroduced load_override with a test on the version :
+         *     - v > 7 : this->detail_common_iarchive::load_override(t, version)
+         *     - v > 6 : 16bit
+         *     - other : 32bit
+         *   --> which is obviously incorrect, see point 1
+         *
+         * the fix here decodes class_id_type on 16bit for all v <= 7, which seems to be the correct behaviour ...
+         */
+        if(boost::serialization::library_version_type (7) < lv){
            this->detail_common_iarchive::load_override(t);
        }
-        else
-        if(boost::archive::library_version_type(6) < lvt){
-            int_least16_t x=0;
-            * this->This() >> x;
-            t = boost::archive::class_id_type(x);
-        }
        else{
-            int x=0;
+            int_least16_t x=0;
            * this->This() >> x;
            t = boost::archive::class_id_type(x);
        }
@@ -122,24 +135,24 @@ protected:
    }

    void load_override(version_type & t){
-        library_version_type lvt = this->get_library_version();
-        if(boost::archive::library_version_type(7) < lvt){
+        boost::serialization::library_version_type  lv = this->get_library_version();
+        if(boost::serialization::library_version_type(7) < lv){
            this->detail_common_iarchive::load_override(t);
        }
        else
-        if(boost::archive::library_version_type(6) < lvt){
+        if(boost::serialization::library_version_type(6) < lv){
            uint_least8_t x=0;
            * this->This() >> x;
            t = boost::archive::version_type(x);
        }
        else
-        if(boost::archive::library_version_type(5) < lvt){
+        if(boost::serialization::library_version_type(5) < lv){
            uint_least16_t x=0;
            * this->This() >> x;
            t = boost::archive::version_type(x);
        }
        else
-        if(boost::archive::library_version_type(2) < lvt){
+        if(boost::serialization::library_version_type(2) < lv){
            // upto 255 versions
            unsigned char x=0;
            * this->This() >> x;
@@ -153,13 +166,13 @@ protected:
    }

    void load_override(boost::serialization::item_version_type & t){
-        library_version_type lvt = this->get_library_version();
-//        if(boost::archive::library_version_type(7) < lvt){
-        if(boost::archive::library_version_type(6) < lvt){
+        boost::serialization::library_version_type lv = this->get_library_version();
+//        if(boost::serialization::library_version_type(7) < lvt){
+        if(boost::serialization::library_version_type(6) < lv){
            this->detail_common_iarchive::load_override(t);
        }
        else
-        if(boost::archive::library_version_type(6) < lvt){
+        if(boost::serialization::library_version_type(6) < lv){
            uint_least16_t x=0;
            * this->This() >> x;
            t = boost::serialization::item_version_type(x);
@@ -172,21 +185,21 @@ protected:
    }

    void load_override(serialization::collection_size_type & t){
-        if(boost::archive::library_version_type(5) < this->get_library_version()){
+        if(boost::serialization::library_version_type(5) < this->get_library_version()){
            this->detail_common_iarchive::load_override(t);
        }
        else{
            unsigned int x=0;
            * this->This() >> x;
            t = serialization::collection_size_type(x);
-        } 
+        }
    }

    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
    load_override(class_name_type & t);
    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
    init();
-   
+
    basic_binary_iarchive(unsigned int flags) :
        detail::common_iarchive<Archive>(flags)
    {}
@@ -14,15 +14,15 @@
 // basic_binary_iprimitive.hpp
 //
 // archives stored as native binary - this should be the fastest way
-// to archive the state of a group of obects.  It makes no attempt to
+// to archive the state of a group of objects.  It makes no attempt to
 // convert to any canonical form.

 // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE
 // ON PLATFORM APART FROM THE ONE THEY ARE CREATED ON

-// (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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

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

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::memcpy; 
+namespace std{
+    using ::memcpy;
    using ::size_t;
 } // namespace std
 #endif
@@ -48,9 +48,8 @@ namespace std{
 #include <boost/integer.hpp>
 #include <boost/integer_traits.hpp>

-//#include <boost/mpl/placeholders.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
-#include <boost/serialization/array.hpp>
+#include <boost/serialization/array_wrapper.hpp>

 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/codecvt_null.hpp>
@@ -58,7 +57,7 @@ namespace std{
 #include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header

-namespace boost { 
+namespace boost {
 namespace archive {

 /////////////////////////////////////////////////////////////////////////////
@@ -90,7 +89,7 @@ public:
    std::locale archive_locale;
    #endif

-    // main template for serilization of primitive types
+    // main template for serialization of primitive types
    template<class T>
    void load(T & t){
        load_binary(& t, sizeof(T));
@@ -98,8 +97,8 @@ public:

    /////////////////////////////////////////////////////////
    // fundamental types that need special treatment
-    
-    // trap usage of invalid uninitialized boolean 
+
+    // trap usage of invalid uninitialized boolean
    void load(bool & t){
        load_binary(& t, sizeof(t));
        int i = t;
@@ -119,29 +118,29 @@ public:

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

-    // the optimized load_array dispatches to load_binary 
+    // the optimized load_array dispatches to load_binary
    template <class ValueType>
    void load_array(serialization::array_wrapper<ValueType>& a, unsigned int)
    {
@@ -155,17 +154,17 @@ public:
 template<class Archive, class Elem, class Tr>
 inline void
 basic_binary_iprimitive<Archive, Elem, Tr>::load_binary(
-    void *address, 
+    void *address,
    std::size_t count
 ){
    // note: an optimizer should eliminate the following for char files
    BOOST_ASSERT(
-        static_cast<std::streamsize>(count / sizeof(Elem)) 
+        static_cast<std::streamsize>(count / sizeof(Elem))
        <= boost::integer_traits<std::streamsize>::const_max
    );
    std::streamsize s = static_cast<std::streamsize>(count / sizeof(Elem));
    std::streamsize scount = m_sb.sgetn(
-        static_cast<Elem *>(address), 
+        static_cast<Elem *>(address),
        s
    );
    if(scount != s)
@@ -9,15 +9,15 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_binary_oarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.

 // archives stored as native binary - this should be the fastest way
-// to archive the state of a group of obects.  It makes no attempt to
+// to archive the state of a group of objects.  It makes no attempt to
 // convert to any canonical form.

 // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE
@@ -53,12 +53,12 @@ namespace detail {
 // class basic_binary_oarchive - write serialized objects to a binary output stream
 // note: this archive has no pretensions to portability.  Archive format
 // may vary across machine architectures and compilers.  About the only
-// guarentee is that an archive created with this code will be readable
-// by a program built with the same tools for the same machne.  This class
-// does have the virtue of buiding the smalles archive in the minimum amount
+// guarantee is that an archive created with this code will be readable
+// by a program built with the same tools for the same machine.  This class
+// does have the virtue of building the smallest 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 : 
+class BOOST_SYMBOL_VISIBLE basic_binary_oarchive :
    public detail::common_oarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -73,7 +73,7 @@ protected:
        friend class detail::interface_oarchive<Archive>;
    #endif
 #endif
-    // any datatype not specifed below will be handled by base class
+    // any datatype not specified below will be handled by base class
    typedef detail::common_oarchive<Archive> detail_common_oarchive;
    template<class T>
    void save_override(const T & t){
@@ -90,18 +90,18 @@ protected:
    BOOST_STATIC_ASSERT(sizeof(object_id_type) == sizeof(uint_least32_t));
    BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t));

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

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

    void save_override(class_id_type & t){
        library_version_type lvt = this->get_library_version();
-        if(boost::archive::library_version_type(7) < lvt){
+        if(boost::serialization::library_version_type(7) < lvt){
            this->detail_common_oarchive::save_override(t);
        }
        else
-        if(boost::archive::library_version_type(6) < lvt){
+        if(boost::serialization::library_version_type(6) < lvt){
            const boost::int_least16_t x = t;
            * this->This() << x;
        }
@@ -155,11 +155,11 @@ protected:

    #if 0
    void save_override(const serialization::collection_size_type & t){
-        if (get_library_version() < boost::archive::library_version_type(6)){
+        if (get_library_version() < boost::serialization::library_version_type(6)){
            unsigned int x=0;
            * this->This() >> x;
            t = serialization::collection_size_type(x);
-        } 
+        }
        else{
            * this->This() >> t;
        }
@@ -9,15 +9,15 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_binary_oprimitive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.

 // archives stored as native binary - this should be the fastest way
-// to archive the state of a group of obects.  It makes no attempt to
+// to archive the state of a group of objects.  It makes no attempt to
 // convert to any canonical form.

 // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE
@@ -32,8 +32,8 @@

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::size_t; 
+namespace std{
+    using ::size_t;
 } // namespace std
 #endif

@@ -43,9 +43,8 @@ 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/serialization/array_wrapper.hpp>

 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/codecvt_null.hpp>
@@ -57,7 +56,7 @@ namespace boost {
 namespace archive {

 /////////////////////////////////////////////////////////////////////////
-// class basic_binary_oprimitive - binary output of prmitives
+// class basic_binary_oprimitive - binary output of primitives

 template<class Archive, class Elem, class Tr>
 class BOOST_SYMBOL_VISIBLE basic_binary_oprimitive {
@@ -93,7 +92,7 @@ public:

    /////////////////////////////////////////////////////////
    // fundamental types that need special treatment
-    
+
    // trap usage of invalid uninitialized boolean which would
    // otherwise crash on load.
    void save(const bool t){
@@ -113,32 +112,32 @@ public:

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

    // we provide an optimized save for all fundamental types
-    // typedef serialization::is_bitwise_serializable<mpl::_1> 
+    // typedef serialization::is_bitwise_serializable<mpl::_1>
    // use_array_optimization;
    // workaround without using mpl lambdas
    struct use_array_optimization {
-        template <class T>  
-        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)  
-            struct apply {  
-                typedef typename boost::serialization::is_bitwise_serializable< T >::type type;  
+        template <class T>
+        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
+            struct apply {
+                typedef typename boost::serialization::is_bitwise_serializable< T >::type type;
            };
        #else
-            struct apply : public boost::serialization::is_bitwise_serializable< T > {};  
+            struct apply : public boost::serialization::is_bitwise_serializable< T > {};
        #endif
    };

-    // the optimized save_array dispatches to save_binary 
+    // the optimized save_array dispatches to save_binary
    template <class ValueType>
    void save_array(boost::serialization::array_wrapper<ValueType> const& a, unsigned int)
    {
@@ -149,15 +148,15 @@ public:
 };

 template<class Archive, class Elem, class Tr>
-inline void 
+inline void
 basic_binary_oprimitive<Archive, Elem, Tr>::save_binary(
-    const void *address, 
+    const void *address,
    std::size_t count
 ){
    // BOOST_ASSERT(count <= std::size_t(boost::integer_traits<std::streamsize>::const_max));
    // 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.
+    // mode where by cr characters receive special treatment.
    // be sure that the output stream is opened with ios::binary
    //if(os.fail())
    //    boost::serialization::throw_exception(
@@ -166,7 +165,7 @@ basic_binary_oprimitive<Archive, Elem, Tr>::save_binary(
    // figure number of elements to output - round up
    count = ( count + sizeof(Elem) - 1) / sizeof(Elem);
    std::streamsize scount = m_sb.sputn(
-        static_cast<const Elem *>(address), 
+        static_cast<const Elem *>(address),
        static_cast<std::streamsize>(count)
    );
    if(count != static_cast<std::size_t>(scount))
@@ -174,14 +173,14 @@ 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 typename OStream::char_type *>(address),
    //    count
    //);
    //BOOST_ASSERT(os.good());
 }

-} //namespace boost 
-} //namespace archive 
+} //namespace boost
+} //namespace archive

 #include <boost/archive/detail/abi_suffix.hpp> // pop pragmas

@@ -11,8 +11,8 @@

 // (C) Copyright 2005 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
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_text_iarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -21,7 +21,7 @@
 //
 // note the fact that on libraries without wide characters, ostream is
 // is not a specialization of basic_ostream which in fact is not defined
-// in such cases.   So we can't use basic_ostream<IStream::char_type> but rather
+// in such cases.   So we can't use basic_istream<IStream::char_type> but rather
 // use two template parameters

 #include <boost/config.hpp>
@@ -46,7 +46,7 @@ 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 BOOST_SYMBOL_VISIBLE basic_text_iarchive :
    public detail::common_iarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -54,7 +54,7 @@ public:
 #else
 protected:
    #if BOOST_WORKAROUND(BOOST_MSVC, < 1500)
-        // for some inexplicable reason insertion of "class" generates compile erro
+        // for some inexplicable reason insertion of "class" generates compile error
        // on msvc 7.1
        friend detail::interface_iarchive<Archive>;
    #else
@@ -62,26 +62,26 @@ protected:
    #endif
 #endif
    // intermediate level to support override of operators
-    // fot templates in the absence of partial function 
+    // 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);
    }
-    // text file don't include the optional information 
+    // text file don't include the optional information
    void load_override(class_id_optional_type & /*t*/){}

    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
    load_override(class_name_type & t);

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

-    basic_text_iarchive(unsigned int flags) : 
+    basic_text_iarchive(unsigned int flags) :
        detail::common_iarchive<Archive>(flags)
    {}
-    ~basic_text_iarchive(){}
+    ~basic_text_iarchive() BOOST_OVERRIDE {}
 };

 } // namespace archive
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_text_iprimitive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

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

 #include <boost/config.hpp>
 #if defined(BOOST_NO_STDC_NAMESPACE)
-namespace std{ 
-    using ::size_t; 
+namespace std{
+    using ::size_t;
    #if ! defined(BOOST_DINKUMWARE_STDLIB) && ! defined(__SGI_STL_PORT)
        using ::locale;
    #endif
@@ -121,9 +121,9 @@ protected:
        t = i;
    }
    #endif
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL
    basic_text_iprimitive(IStream  &is, bool no_codecvt);
-    BOOST_ARCHIVE_OR_WARCHIVE_DECL 
+    BOOST_ARCHIVE_OR_WARCHIVE_DECL
    ~basic_text_iprimitive();
 public:
    BOOST_ARCHIVE_OR_WARCHIVE_DECL void
@@ -9,9 +9,9 @@
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // basic_text_oarchive.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
+// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+// 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)

 //  See http://www.boost.org for updates, documentation, and revision history.
@@ -44,9 +44,9 @@ namespace detail {
 } // namespace detail

 /////////////////////////////////////////////////////////////////////////
-// class basic_text_oarchive 
+// class basic_text_oarchive
 template<class Archive>
-class BOOST_SYMBOL_VISIBLE basic_text_oarchive : 
+class BOOST_SYMBOL_VISIBLE basic_text_oarchive :
    public detail::common_oarchive<Archive>
 {
 #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS
@@ -89,7 +89,7 @@ protected:
        this->detail_common_oarchive::save_override(t);
    }

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

    void save_override(const class_name_type & t){
@@ -104,7 +104,7 @@ protected:
        detail::common_oarchive<Archive>(flags),
        delimiter(none)
    {}
-    ~basic_text_oarchive(){}
+    ~basic_text_oarchive() BOOST_OVERRIDE {}
 };

 } // namespace archive
--- a/Show More
+++ b/Show More