Branch for working on the documentation tools documentation.

[SVN r68640]
2011-02-04 21:18:24 +00:00
58 changed files with 338 additions and 1364 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,640 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - develop
-      - feature/**
-
-env:
-  UBSAN_OPTIONS: print_stacktrace=1
-
-jobs:
-  posix:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: gcc-4.8
-            cxxstd: "11"
-            container: ubuntu:16.04
-            os: ubuntu-latest
-            install: g++-4.8-multilib
-            address-model: 32,64
-          - toolset: gcc-4.9
-            cxxstd: "11"
-            container: ubuntu:16.04
-            os: ubuntu-latest
-            install: g++-4.9-multilib
-            address-model: 32,64
-          - toolset: gcc-5
-            cxxstd: "11,14,1z"
-            container: ubuntu:18.04
-            os: ubuntu-latest
-            install: g++-5-multilib
-            address-model: 32,64
-          - toolset: gcc-6
-            cxxstd: "11,14,1z"
-            container: ubuntu:18.04
-            os: ubuntu-latest
-            install: g++-6-multilib
-            address-model: 32,64
-          - toolset: gcc-7
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: g++-7-multilib
-            address-model: 32,64
-          - toolset: gcc-8
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-8-multilib
-            address-model: 32,64
-          - toolset: gcc-9
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-9-multilib
-            address-model: 32,64
-          - toolset: gcc-10
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-10-multilib
-            address-model: 32,64
-          - toolset: gcc-11
-            cxxstd: "11,14,17,20,2b"
-            os: ubuntu-22.04
-            install: g++-11-multilib
-            address-model: 32,64
-          - toolset: gcc-12
-            cxxstd: "11,14,17,20,2b"
-            os: ubuntu-22.04
-            install: g++-12-multilib
-            address-model: 32,64
-          - toolset: gcc-13
-            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.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: clang
-            compiler: clang++-3.9
-            cxxstd: "11,14"
-            container: ubuntu:18.04
-            os: ubuntu-latest
-            install: clang-3.9
-          - toolset: clang
-            compiler: clang++-4.0
-            cxxstd: "11,14"
-            container: ubuntu:18.04
-            os: ubuntu-latest
-            install: clang-4.0
-          - toolset: clang
-            compiler: clang++-5.0
-            cxxstd: "11,14,1z"
-            container: ubuntu:18.04
-            os: ubuntu-latest
-            install: clang-5.0
-          - toolset: clang
-            compiler: clang++-6.0
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: clang-6.0
-          - toolset: clang
-            compiler: clang++-7
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: clang-7
-          - toolset: clang
-            compiler: clang++-8
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: clang-8
-          - toolset: clang
-            compiler: clang++-9
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: clang-9
-          - toolset: clang
-            compiler: clang++-10
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-          - toolset: clang
-            compiler: clang++-11
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-          - toolset: clang
-            compiler: clang++-12
-            cxxstd: "11,14,17,20"
-            os: ubuntu-20.04
-          - toolset: clang
-            compiler: clang++-13
-            cxxstd: "11,14,17,20"
-            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:23.04
-            os: ubuntu-latest
-            install: clang-16
-          - toolset: clang
-            compiler: clang++-17
-            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.10
-            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
-            cxxstd: "11,14,17,20,2b"
-            os: macos-12
-          - toolset: clang
-            cxxstd: "11,14,17,20,2b"
-            os: macos-13
-          - toolset: clang
-            cxxstd: "11,14,17,20,2b"
-            os: macos-14
-
-    runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
-
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-      - name: Enable Node 16
-        run: |
-          echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
-
-      - uses: actions/checkout@v3
-
-      - name: Setup container environment
-        if: matrix.container
-        run: |
-          apt-get update
-          apt-get -y install sudo python3 git g++
-
-      - 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
-          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python3 tools/boostdep/depinst/depinst.py -I example $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 toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release
-
-  windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: msvc-14.0
-            cxxstd: 14,latest
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.2
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.3
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2022
-          - toolset: clang-win
-            cxxstd: "14,17,latest"
-            addrmd: 32,64
-            os: windows-2022
-          - toolset: gcc
-            cxxstd: "11,14,17,2a"
-            addrmd: 64
-            os: windows-2019
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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" -I example %LIBRARY%
-          cmd /c bootstrap
-          b2 -d0 headers
-
-      - name: Run tests
-        shell: cmd
-        run: |
-          cd ../boost-root
-          b2 -j3 libs/%LIBRARY%/test 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-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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
-          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-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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
-          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-20.04
-          - os: ubuntu-22.04
-          - os: macos-12
-          - os: macos-13
-          - os: macos-14
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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
-          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 -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-2019
-          - os: windows-2022
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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-2019
-          - os: windows-2022
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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-2019
-          - os: windows-2022
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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% -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
--- a/.travis.yml
+++ b/.travis.yml
@ -1,42 +0,0 @@
-# Copyright 2016 Edward Diener
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-language: cpp
-
-sudo: false
-
-python: "2.7"
-
-os:
-  - linux
-  - osx
-
-branches:
-  only:
-    - master
-    - develop
-
-install:
-  - cd ..
-  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-  - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/config
-  - git submodule update --init tools/boostdep
-  - git submodule update --init tools/boost_install
-  - git submodule update --init libs/headers
-  - cp -r $TRAVIS_BUILD_DIR/* libs/function_types
-  - python tools/boostdep/depinst/depinst.py -I example function_types
-  - ./bootstrap.sh
-  - ./b2 headers
-
-script:
-  - TOOLSET=gcc,clang
-  - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
-  - ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET || true
-  - ./b2 libs/function_types/test toolset=$TOOLSET
-
-notifications:
-  email:
-    on_success: always
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,29 +0,0 @@
-# Generated by `boostdep --cmake function_types`
-# 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.20)
-
-project(boost_function_types VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
-
-add_library(boost_function_types INTERFACE)
-add_library(Boost::function_types ALIAS boost_function_types)
-
-target_include_directories(boost_function_types INTERFACE include)
-
-target_link_libraries(boost_function_types
-  INTERFACE
-    Boost::config
-    Boost::core
-    Boost::detail
-    Boost::mpl
-    Boost::preprocessor
-    Boost::type_traits
-)
-
-if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
-
-  add_subdirectory(test)
-
-endif()
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,48 +0,0 @@
-# Copyright 2017 Edward Diener
-# 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:
-    - master
-    - develop
-
-environment:
-  matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-10.0,msvc-11.0
-      ADDRMD: 32
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-12.0,msvc-14.0
-      ADDRESS_MODEL: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      CXXSTD: 14,17
-      ADDRESS_MODEL: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      TOOLSET: msvc-14.2
-      CXXSTD: 14,17
-      ADDRESS_MODEL: 32,64
-
-install:
-  - cd ..
-  - git clone -b %APPVEYOR_REPO_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
-  - git submodule update --init tools/boost_install
-  - git submodule update --init libs/headers
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types
-  - python tools/boostdep/depinst/depinst.py -I example function_types
-  - bootstrap
-  - b2 headers
-
-build: off
-
-test_script:
-  - b2 libs/function_types/test toolset=%TOOLSET%
--- a/build.jam
+++ b/build.jam
@ -1,25 +0,0 @@
-# Copyright 2023-2024 René Ferdinand Rivera Morell
-# Copyright 2024 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# https://www.boost.org/LICENSE_1_0.txt
-
-require-b2 5.2 ;
-
-constant boost_dependencies :
-    /boost/config//boost_config
-    /boost/core//boost_core
-    /boost/detail//boost_detail
-    /boost/mpl//boost_mpl
-    /boost/preprocessor//boost_preprocessor
-    /boost/type_traits//boost_type_traits
-    ;
-
-project /boost/function_types ;
-
-explicit
-    [ alias boost_function_types : : : : <include>include <library>$(boost_dependencies) ]
-    [ alias all : boost_function_types example test ]
-    ;
-
-call-if : boost-library function_types
-    ;
--- a/doc/Jamfile
+++ b/doc/Jamfile
@ -19,9 +19,3 @@ boostbook standalone
        <xsl:param>toc.max.depth=1
    ;

-
-###############################################################################
-alias boostdoc ;
-explicit boostdoc ;
-alias boostrelease : standalone ;
-explicit boostrelease ;
--- a/doc/function_types.qbk
+++ b/doc/function_types.qbk
@ -837,43 +837,6 @@ values for the same property the value of the rightmost argument is used.

 [endsect]

-[section:has_property_tag has_property_tag]
-
-  template<class Tag, class PropertyTag> 
-  struct has_property_tag;
-
-[*Header]
-
-  #include <boost/function_types/property_tags.hpp>
-
-[variablelist
-  [[[^Tag]][Possibly compound property tag]]
-  [[[^PropertyTag]][Single property tag]]
-  [[[^has_property_tag<Tag,PropertyTag>]][Test (possibly) compound property tag for single property tag]]
-]
-
-A metafunction for testing that a compound property tag has a particular single
-property tag in its composition. Returns a boolean value of true if the particular single
-property tag is part of the compound property tag, otherwise false.
-
-For convenience there are also individual metafunctions for the built-in property tags of the form
-
-  template<class Tag> 
-  struct has_'name'_property_tag;
-
-which works exactly the same as `has_property_tag`, where name can be
-[^variadic],[^default_cc],[^const],[^volatile],[^cv],or [^null].
-In these individual metafunctions [^const] is short for [^const_qualified],
-[^volatile] is short for [^volatile_qualified],
-[^cv] is short for [^cv_qualified], and [^null] is short for [^null_tag].
-
-[note Testing for the [^null_tag], with either `has_property_tag<Tag,null_tag>`
-or `has_null_property_tag<Tag>`, always tests whether the [^Tag] is the single
-[^null_tag] property_tag.
-]
-
-[endsect]
-
 [endsect] [/ Tag Types]

 [/ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ]
--- a/doc/html/boost_functiontypes/about_tag_types.html
+++ b/doc/html/boost_functiontypes/about_tag_types.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>About Tag Types</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="use_cases.html" title="Use Cases">
@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.about_tag_types"></a><a class="link" href="about_tag_types.html" title="About Tag Types">About Tag Types</a>
+<a name="boost_functiontypes.about_tag_types"></a><a class="link" href="about_tag_types.html" title="About Tag Types"> About Tag Types</a>
 </h2></div></div></div>
 <p>
      Boost.FunctionTypes uses tag types to encode properties that are not types
@ -80,8 +80,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/acknowledgements.html
+++ b/doc/html/boost_functiontypes/acknowledgements.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Acknowledgements</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="rationale.html" title="Rationale">
@ -23,7 +23,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements">Acknowledgements</a>
+<a name="boost_functiontypes.acknowledgements"></a><a class="link" href="acknowledgements.html" title="Acknowledgements"> Acknowledgements</a>
 </h2></div></div></div>
 <p>
      Thanks go to the following people for supporting the development of this library
@ -79,8 +79,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/introduction.html
+++ b/doc/html/boost_functiontypes/introduction.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Introduction</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
+<a name="boost_functiontypes.introduction"></a><a class="link" href="introduction.html" title="Introduction"> Introduction</a>
 </h2></div></div></div>
 <p>
      Boost.FunctionTypes provides functionality to classify, decompose and synthesize
@ -77,8 +77,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/rationale.html
+++ b/doc/html/boost_functiontypes/rationale.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Rationale</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="reference/macros.html" title="Macros">
@ -24,10 +24,10 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.rationale"></a><a class="link" href="rationale.html" title="Rationale">Rationale</a>
+<a name="boost_functiontypes.rationale"></a><a class="link" href="rationale.html" title="Rationale"> Rationale</a>
 </h2></div></div></div>
 <a name="boost_functiontypes.rationale.error_handling_rationale"></a><h4>
-<a name="boost_functiontypes.rationale.error_handling_rationale-heading"></a>
+<a name="id768333"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.error_handling_rationale">Error
      handling rationale</a>
    </h4>
@ -42,7 +42,7 @@
      can be spotted easily.
    </p>
 <a name="boost_functiontypes.rationale.why_mpl_sequences_"></a><h4>
-<a name="boost_functiontypes.rationale.why_mpl_sequences_-heading"></a>
+<a name="id768365"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_mpl_sequences_">Why MPL Sequences?</a>
    </h4>
 <p>
@ -55,7 +55,7 @@
      so another reason is interoperability.
    </p>
 <a name="boost_functiontypes.rationale.pointer_to_member_object_types"></a><h4>
-<a name="boost_functiontypes.rationale.pointer_to_member_object_types-heading"></a>
+<a name="id768415"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.pointer_to_member_object_types">Pointer
      to member object types</a>
    </h4>
@ -64,7 +64,7 @@
      functionals.
    </p>
 <a name="boost_functiontypes.rationale.the_classtransform_template_parameter"></a><h4>
-<a name="boost_functiontypes.rationale.the_classtransform_template_parameter-heading"></a>
+<a name="id768441"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.the_classtransform_template_parameter">The
      ClassTransform template parameter</a>
    </h4>
@ -81,7 +81,7 @@
      all parameters uniformly.
    </p>
 <a name="boost_functiontypes.rationale.why_tag_types_"></a><h4>
-<a name="boost_functiontypes.rationale.why_tag_types_-heading"></a>
+<a name="id768490"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_tag_types_">Why tag types?</a>
    </h4>
 <p>
@ -100,7 +100,7 @@
      with older compilers.
    </p>
 <a name="boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_"></a><h4>
-<a name="boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_-heading"></a>
+<a name="id768534"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.is_it_safe_to_have_the_synthesis_templates_take_a_callable__builtin_type_or_an_mpl_sequence_as_the_first_template_argument_">Is
      it safe to have the synthesis templates take a callable builtin type or an
      MPL sequence as the first template argument?</a>
@ -115,7 +115,7 @@
      type a sequence have been included, which can easily violate the ODR.
    </p>
 <a name="boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_"></a><h4>
-<a name="boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_-heading"></a>
+<a name="id768574"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_does_the_hidden__literal_this__literal__parameter_count_for_the__function_arity_of_member_functions_">Why
      does the hidden <code class="literal">this</code> parameter count for the function arity
      of member functions?</a>
@ -126,7 +126,7 @@
 <pre class="programlisting"><span class="identifier">mpl</span><span class="special">::</span><span class="identifier">size</span><span class="special">&lt;</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;</span> <span class="special">&gt;::</span><span class="identifier">value</span> <span class="special">==</span> <a class="link" href="reference/decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a><span class="special">&lt;</span><span class="identifier">T</span><span class="special">&gt;::</span><span class="identifier">value</span>
 </pre>
 <a name="boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_"></a><h4>
-<a name="boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_-heading"></a>
+<a name="id768683"></a>
      <a class="link" href="rationale.html#boost_functiontypes.rationale.why_ignore_top_level_cv_qualifiers_on_pointers_">Why
      ignore top-level cv-qualifiers on pointers?</a>
    </h4>
@ -137,8 +137,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference.html
+++ b/doc/html/boost_functiontypes/reference.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Reference</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="about_tag_types.html" title="About Tag Types">
@ -24,23 +24,22 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
+<a name="boost_functiontypes.reference"></a><a class="link" href="reference.html" title="Reference"> Reference</a>
 </h2></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="reference/classification.html">Class templates
-      for type classification</a></span></dt>
-<dt><span class="section"><a href="reference/decomposition.html">Class templates
+<dt><span class="section"><a href="reference/classification.html"> Class
+      templates for type classification</a></span></dt>
+<dt><span class="section"><a href="reference/decomposition.html"> Class templates
      for type decomposition</a></span></dt>
-<dt><span class="section"><a href="reference/synthesis.html">Class templates
+<dt><span class="section"><a href="reference/synthesis.html"> Class templates
      for type synthesis</a></span></dt>
-<dt><span class="section"><a href="reference/tag_types.html">Tag Types</a></span></dt>
-<dt><span class="section"><a href="reference/macros.html">Macros</a></span></dt>
+<dt><span class="section"><a href="reference/tag_types.html"> Tag Types</a></span></dt>
+<dt><span class="section"><a href="reference/macros.html"> Macros</a></span></dt>
 </dl></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference/classification.html
+++ b/doc/html/boost_functiontypes/reference/classification.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type classification</title>
 <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="../reference.html" title="Reference">
@ -24,22 +24,31 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.classification"></a><a class="link" href="classification.html" title="Class templates for type classification">Class templates
-      for type classification</a>
+<a name="boost_functiontypes.reference.classification"></a><a class="link" href="classification.html" title="Class templates for type classification"> Class
+      templates for type classification</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function">is_function</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_pointer">is_function_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_reference">is_function_reference</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_pointer">is_member_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer">is_member_object_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer">is_member_function_pointer</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin">is_callable_builtin</a></span></dt>
-<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin">is_nonmember_callable_builtin</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function">
+        is_function</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_pointer">
+        is_function_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_function_reference">
+        is_function_reference</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_pointer">
+        is_member_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer">
+        is_member_object_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer">
+        is_member_function_pointer</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin">
+        is_callable_builtin</a></span></dt>
+<dt><span class="section"><a href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin">
+        is_nonmember_callable_builtin</a></span></dt>
 </dl></div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function" title="is_function">is_function</a>
+<a name="boost_functiontypes.reference.classification.is_function"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function" title="is_function">
+        is_function</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function</span><span class="special">;</span>
@ -79,7 +88,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">is_function_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_pointer" title="is_function_pointer">
+        is_function_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function_pointer</span><span class="special">;</span>
@ -119,7 +129,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_function_reference"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_reference" title="is_function_reference">is_function_reference</a>
+<a name="boost_functiontypes.reference.classification.is_function_reference"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_function_reference" title="is_function_reference">
+        is_function_reference</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_function_reference</span><span class="special">;</span>
@ -159,7 +170,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_pointer" title="is_member_pointer">is_member_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_pointer" title="is_member_pointer">
+        is_member_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_pointer</span><span class="special">;</span>
@ -199,7 +211,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_object_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer" title="is_member_object_pointer">is_member_object_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_object_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_object_pointer" title="is_member_object_pointer">
+        is_member_object_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_object_pointer</span><span class="special">;</span>
@ -234,7 +247,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_member_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer" title="is_member_function_pointer">is_member_function_pointer</a>
+<a name="boost_functiontypes.reference.classification.is_member_function_pointer"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_member_function_pointer" title="is_member_function_pointer">
+        is_member_function_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_member_function_pointer</span><span class="special">;</span>
@ -274,7 +288,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin" title="is_callable_builtin">is_callable_builtin</a>
+<a name="boost_functiontypes.reference.classification.is_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_callable_builtin" title="is_callable_builtin">
+        is_callable_builtin</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_callable_builtin</span><span class="special">;</span>
@ -314,7 +329,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.classification.is_nonmember_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin" title="is_nonmember_callable_builtin">is_nonmember_callable_builtin</a>
+<a name="boost_functiontypes.reference.classification.is_nonmember_callable_builtin"></a><a class="link" href="classification.html#boost_functiontypes.reference.classification.is_nonmember_callable_builtin" title="is_nonmember_callable_builtin">
+        is_nonmember_callable_builtin</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">is_nonmember_callable_builtin</span><span class="special">;</span>
@ -356,8 +372,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference/decomposition.html
+++ b/doc/html/boost_functiontypes/reference/decomposition.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type decomposition</title>
 <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="classification.html" title="Class templates for type classification">
@ -24,18 +24,23 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.decomposition"></a><a class="link" href="decomposition.html" title="Class templates for type decomposition">Class templates
+<a name="boost_functiontypes.reference.decomposition"></a><a class="link" href="decomposition.html" title="Class templates for type decomposition"> Class templates
      for type decomposition</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.result_type">result_type</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types">parameter_types</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity">function_arity</a></span></dt>
-<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.components">components</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.result_type">
+        result_type</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types">
+        parameter_types</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity">
+        function_arity</a></span></dt>
+<dt><span class="section"><a href="decomposition.html#boost_functiontypes.reference.decomposition.components">
+        components</a></span></dt>
 </dl></div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.result_type"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.result_type" title="result_type">result_type</a>
+<a name="boost_functiontypes.reference.decomposition.result_type"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.result_type" title="result_type">
+        result_type</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">result_type</span><span class="special">;</span>
@ -68,7 +73,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.parameter_types"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">parameter_types</a>
+<a name="boost_functiontypes.reference.decomposition.parameter_types"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.parameter_types" title="parameter_types">
+        parameter_types</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">parameter_types</span><span class="special">;</span>
@ -111,7 +117,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.function_arity"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">function_arity</a>
+<a name="boost_functiontypes.reference.decomposition.function_arity"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.function_arity" title="function_arity">
+        function_arity</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">F</span><span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">function_arity</span><span class="special">;</span>
@ -153,7 +160,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.decomposition.components"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.components" title="components">components</a>
+<a name="boost_functiontypes.reference.decomposition.components"></a><a class="link" href="decomposition.html#boost_functiontypes.reference.decomposition.components" title="components">
+        components</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">T</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">ClassTransform</span> <span class="special">=</span> <span class="identifier">add_reference</span><span class="special">&lt;</span><span class="identifier">_</span><span class="special">&gt;</span> <span class="special">&gt;</span>
 <span class="keyword">struct</span> <span class="identifier">components</span><span class="special">;</span>
@ -203,8 +211,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference/macros.html
+++ b/doc/html/boost_functiontypes/reference/macros.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Macros</title>
 <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="tag_types.html" title="Tag Types">
@ -24,22 +24,32 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.macros"></a><a class="link" href="macros.html" title="Macros">Macros</a>
+<a name="boost_functiontypes.reference.macros"></a><a class="link" href="macros.html" title="Macros"> Macros</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY">BOOST_FT_MAX_ARITY</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES">BOOST_FT_CC_NAMES</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC">BOOST_FT_CC_*</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs">BOOST_FT_COMMON_X86_CCs</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX">BOOST_FT_SYNTAX</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM">BOOST_FT_NULLARY_PARAM</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT">BOOST_FT_NO_CV_FUNC_SUPPORT</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE">BOOST_FT_PREPROCESSING_MODE</a></span></dt>
-<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING">BOOST_FT_CC_PREPROCESSING</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY">
+        BOOST_FT_MAX_ARITY</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES">
+        BOOST_FT_CC_NAMES</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC">
+        BOOST_FT_CC_*</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs">
+        BOOST_FT_COMMON_X86_CCs</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX">
+        BOOST_FT_SYNTAX</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM">
+        BOOST_FT_NULLARY_PARAM</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT">
+        BOOST_FT_NO_CV_FUNC_SUPPORT</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE">
+        BOOST_FT_PREPROCESSING_MODE</a></span></dt>
+<dt><span class="section"><a href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING">
+        BOOST_FT_CC_PREPROCESSING</a></span></dt>
 </dl></div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY" title="BOOST_FT_MAX_ARITY">BOOST_FT_MAX_ARITY</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_MAX_ARITY" title="BOOST_FT_MAX_ARITY">
+        BOOST_FT_MAX_ARITY</a>
 </h4></div></div></div>
 <p>
          Expands to a numeric value that describes the maximum function arity supported
@ -57,7 +67,8 @@
      </p>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES" title="BOOST_FT_CC_NAMES">BOOST_FT_CC_NAMES</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_NAMES" title="BOOST_FT_CC_NAMES">
+        BOOST_FT_CC_NAMES</a>
 </h4></div></div></div>
 <p>
          Expands to a <a href="../../../../../preprocessor/doc/data/sequences.html" target="_top">sequence</a>
@ -94,7 +105,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC" title="BOOST_FT_CC_*">BOOST_FT_CC_*</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC" title="BOOST_FT_CC_*">
+        BOOST_FT_CC_*</a>
 </h4></div></div></div>
 <p>
          Enables a specific calling convention. * denotes the macro suffix, as defined
@ -133,7 +145,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs" title="BOOST_FT_COMMON_X86_CCs">BOOST_FT_COMMON_X86_CCs</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_COMMON_X86_CCs" title="BOOST_FT_COMMON_X86_CCs">
+        BOOST_FT_COMMON_X86_CCs</a>
 </h4></div></div></div>
 <p>
          Defining this macro causes the following macros to be defined, if not defined
@ -146,7 +159,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_SYNTAX"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX" title="BOOST_FT_SYNTAX">BOOST_FT_SYNTAX</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_SYNTAX"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_SYNTAX" title="BOOST_FT_SYNTAX">
+        BOOST_FT_SYNTAX</a>
 </h4></div></div></div>
 <p>
          This macro allows to change the syntax of callable builtin types. It is
@ -162,7 +176,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM" title="BOOST_FT_NULLARY_PARAM">BOOST_FT_NULLARY_PARAM</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NULLARY_PARAM" title="BOOST_FT_NULLARY_PARAM">
+        BOOST_FT_NULLARY_PARAM</a>
 </h4></div></div></div>
 <p>
          Set to <code class="literal">void</code> for compilers that insist on a <code class="literal">void</code>
@ -171,7 +186,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT" title="BOOST_FT_NO_CV_FUNC_SUPPORT">BOOST_FT_NO_CV_FUNC_SUPPORT</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_NO_CV_FUNC_SUPPORT" title="BOOST_FT_NO_CV_FUNC_SUPPORT">
+        BOOST_FT_NO_CV_FUNC_SUPPORT</a>
 </h4></div></div></div>
 <p>
          Disables support for cv-qualified function types. Cv-qualified function
@ -187,7 +203,8 @@
      </p>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE" title="BOOST_FT_PREPROCESSING_MODE">BOOST_FT_PREPROCESSING_MODE</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_PREPROCESSING_MODE" title="BOOST_FT_PREPROCESSING_MODE">
+        BOOST_FT_PREPROCESSING_MODE</a>
 </h4></div></div></div>
 <p>
          Makes the compiler preprocess as much as possible of the library code (rather
@ -196,7 +213,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING" title="BOOST_FT_CC_PREPROCESSING">BOOST_FT_CC_PREPROCESSING</a>
+<a name="boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING"></a><a class="link" href="macros.html#boost_functiontypes.reference.macros.BOOST_FT_CC_PREPROCESSING" title="BOOST_FT_CC_PREPROCESSING">
+        BOOST_FT_CC_PREPROCESSING</a>
 </h4></div></div></div>
 <p>
          Makes the compiler preprocess the loop over possible names for custom calling
@ -211,8 +229,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference/synthesis.html
+++ b/doc/html/boost_functiontypes/reference/synthesis.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Class templates for type synthesis</title>
 <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="decomposition.html" title="Class templates for type decomposition">
@ -24,18 +24,23 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.synthesis"></a><a class="link" href="synthesis.html" title="Class templates for type synthesis">Class templates
+<a name="boost_functiontypes.reference.synthesis"></a><a class="link" href="synthesis.html" title="Class templates for type synthesis"> Class templates
      for type synthesis</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_type">function_type</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer">function_pointer</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference">function_reference</a></span></dt>
-<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer">member_function_pointer</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_type">
+        function_type</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer">
+        function_pointer</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference">
+        function_reference</a></span></dt>
+<dt><span class="section"><a href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer">
+        member_function_pointer</a></span></dt>
 </dl></div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_type"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">function_type</a>
+<a name="boost_functiontypes.reference.synthesis.function_type"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_type" title="function_type">
+        function_type</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_type</span><span class="special">;</span>
@ -74,7 +79,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">function_pointer</a>
+<a name="boost_functiontypes.reference.synthesis.function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_pointer" title="function_pointer">
+        function_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_pointer</span><span class="special">;</span>
@ -113,7 +119,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.function_reference"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference" title="function_reference">function_reference</a>
+<a name="boost_functiontypes.reference.synthesis.function_reference"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.function_reference" title="function_reference">
+        function_reference</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">function_reference</span><span class="special">;</span>
@ -152,7 +159,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.synthesis.member_function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer" title="member_function_pointer">member_function_pointer</a>
+<a name="boost_functiontypes.reference.synthesis.member_function_pointer"></a><a class="link" href="synthesis.html#boost_functiontypes.reference.synthesis.member_function_pointer" title="member_function_pointer">
+        member_function_pointer</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">typename</span> <span class="identifier">Types</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">Tag</span> <span class="special">=</span> <a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a><span class="special">&gt;</span> 
 <span class="keyword">struct</span> <span class="identifier">member_function_pointer</span><span class="special">;</span>
@ -198,8 +206,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/reference/tag_types.html
+++ b/doc/html/boost_functiontypes/reference/tag_types.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Tag Types</title>
 <link rel="stylesheet" href="../../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="synthesis.html" title="Class templates for type synthesis">
@ -24,26 +24,38 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="boost_functiontypes.reference.tag_types"></a><a class="link" href="tag_types.html" title="Tag Types">Tag Types</a>
+<a name="boost_functiontypes.reference.tag_types"></a><a class="link" href="tag_types.html" title="Tag Types"> Tag Types</a>
 </h3></div></div></div>
 <div class="toc"><dl>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.variadic">variadic</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic">non_variadic</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc">default_cc</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified">const_qualified</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_const">non_const</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified">volatile_qualified</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile">non_volatile</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv">non_cv</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile">const_non_volatile</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const">volatile_non_const</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied">cv_qualfied</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag">null_tag</a></span></dt>
-<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.tag">tag</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.variadic">
+        variadic</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic">
+        non_variadic</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc">
+        default_cc</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified">
+        const_qualified</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_const">
+        non_const</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified">
+        volatile_qualified</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile">
+        non_volatile</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv"> non_cv</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile">
+        const_non_volatile</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const">
+        volatile_non_const</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied">
+        cv_qualfied</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag">
+        null_tag</a></span></dt>
+<dt><span class="section"><a href="tag_types.html#boost_functiontypes.reference.tag_types.tag"> tag</a></span></dt>
 </dl></div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.variadic" title="variadic">variadic</a>
+<a name="boost_functiontypes.reference.tag_types.variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.variadic" title="variadic">
+        variadic</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">variadic</span><span class="special">;</span>
 </pre>
@ -59,7 +71,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic" title="non_variadic">non_variadic</a>
+<a name="boost_functiontypes.reference.tag_types.non_variadic"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_variadic" title="non_variadic">
+        non_variadic</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_variadic</span><span class="special">;</span>
 </pre>
@ -74,7 +87,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.default_cc"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc" title="default_cc">default_cc</a>
+<a name="boost_functiontypes.reference.tag_types.default_cc"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.default_cc" title="default_cc">
+        default_cc</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">default_cc</span><span class="special">;</span>
 </pre>
@ -89,7 +103,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.const_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified" title="const_qualified">const_qualified</a>
+<a name="boost_functiontypes.reference.tag_types.const_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_qualified" title="const_qualified">
+        const_qualified</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_qualified</span><span class="special">;</span>
 </pre>
@ -104,7 +119,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_const" title="non_const">non_const</a>
+<a name="boost_functiontypes.reference.tag_types.non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_const" title="non_const">
+        non_const</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_const</span><span class="special">;</span>
 </pre>
@ -119,7 +135,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.volatile_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified" title="volatile_qualified">volatile_qualified</a>
+<a name="boost_functiontypes.reference.tag_types.volatile_qualified"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_qualified" title="volatile_qualified">
+        volatile_qualified</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_qualified</span><span class="special">;</span>
 </pre>
@ -134,7 +151,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile" title="non_volatile">non_volatile</a>
+<a name="boost_functiontypes.reference.tag_types.non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_volatile" title="non_volatile">
+        non_volatile</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_volatile</span><span class="special">;</span>
 </pre>
@ -149,7 +167,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.non_cv"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv" title="non_cv">non_cv</a>
+<a name="boost_functiontypes.reference.tag_types.non_cv"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.non_cv" title="non_cv"> non_cv</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">non_cv</span><span class="special">;</span>
 </pre>
@ -166,7 +184,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.const_non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile" title="const_non_volatile">const_non_volatile</a>
+<a name="boost_functiontypes.reference.tag_types.const_non_volatile"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.const_non_volatile" title="const_non_volatile">
+        const_non_volatile</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">const_non_volatile</span><span class="special">;</span>
 </pre>
@ -183,7 +202,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.volatile_non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const" title="volatile_non_const">volatile_non_const</a>
+<a name="boost_functiontypes.reference.tag_types.volatile_non_const"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.volatile_non_const" title="volatile_non_const">
+        volatile_non_const</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">volatile_non_const</span><span class="special">;</span>
 </pre>
@ -200,7 +220,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.cv_qualfied"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied" title="cv_qualfied">cv_qualfied</a>
+<a name="boost_functiontypes.reference.tag_types.cv_qualfied"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.cv_qualfied" title="cv_qualfied">
+        cv_qualfied</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">cv_qualified</span><span class="special">;</span>
 </pre>
@ -217,7 +238,8 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.null_tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">null_tag</a>
+<a name="boost_functiontypes.reference.tag_types.null_tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.null_tag" title="null_tag">
+        null_tag</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">typedef</span> <span class="emphasis"><em>unspecified</em></span> <span class="identifier">null_tag</span><span class="special">;</span>
 </pre>
@ -232,7 +254,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="boost_functiontypes.reference.tag_types.tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.tag" title="tag">tag</a>
+<a name="boost_functiontypes.reference.tag_types.tag"></a><a class="link" href="tag_types.html#boost_functiontypes.reference.tag_types.tag" title="tag"> tag</a>
 </h4></div></div></div>
 <pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span><span class="keyword">class</span> <span class="identifier">Tag1</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Tag2</span><span class="special">,</span> 
    <span class="keyword">class</span> <span class="identifier">Tag3</span> <span class="special">=</span> <span class="identifier">null_tag</span><span class="special">,</span> <span class="keyword">class</span> <span class="identifier">Tag4</span> <span class="special">=</span> <span class="identifier">null_tag</span><span class="special">&gt;</span>
@ -264,8 +286,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/boost_functiontypes/use_cases.html
+++ b/doc/html/boost_functiontypes/use_cases.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Use Cases</title>
 <link rel="stylesheet" href="../../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="prev" href="introduction.html" title="Introduction">
@ -24,7 +24,7 @@
 </div>
 <div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="boost_functiontypes.use_cases"></a><a class="link" href="use_cases.html" title="Use Cases">Use Cases</a>
+<a name="boost_functiontypes.use_cases"></a><a class="link" href="use_cases.html" title="Use Cases"> Use Cases</a>
 </h2></div></div></div>
 <p>
      Generic libraries that accept callable arguments are common in C++. Accepting
@ -160,8 +160,7 @@
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
 <td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright &#169; 2004-2007 Tobias
-      Schwinger<p>
+<td align="right"><div class="copyright-footer">Copyright &#169; 2004 -2007 Tobias Schwinger<p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Chapter&#160;1.&#160;Boost.FunctionTypes 2.5</title>
 <link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Boost.FunctionTypes 2.5">
 <link rel="next" href="boost_functiontypes/introduction.html" title="Introduction">
 </head>
@ -25,10 +25,9 @@
 <div><div class="author"><h3 class="author">
 <span class="firstname">Tobias</span> <span class="surname">Schwinger</span>
 </h3></div></div>
-<div><p class="copyright">Copyright &#169; 2004-2007 Tobias
-      Schwinger</p></div>
+<div><p class="copyright">Copyright &#169; 2004 -2007 Tobias Schwinger</p></div>
 <div><div class="legalnotice">
-<a name="id768638"></a><p>
+<a name="id759690"></a><p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
@ -37,17 +36,17 @@
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
-<dt><span class="section"><a href="boost_functiontypes/introduction.html">Introduction</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/use_cases.html">Use Cases</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/about_tag_types.html">About Tag Types</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/reference.html">Reference</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/rationale.html">Rationale</a></span></dt>
-<dt><span class="section"><a href="boost_functiontypes/acknowledgements.html">Acknowledgements</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/introduction.html"> Introduction</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/use_cases.html"> Use Cases</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/about_tag_types.html"> About Tag Types</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/reference.html"> Reference</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/rationale.html"> Rationale</a></span></dt>
+<dt><span class="section"><a href="boost_functiontypes/acknowledgements.html"> Acknowledgements</a></span></dt>
 </dl>
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 09, 2008 at 18:26:31 +0100</small></p></td>
+<td align="left"><p><small>Last revised:  ,  at  </small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/example/Jamfile
+++ b/example/Jamfile
@ -1,27 +1,19 @@

-# (C) Copyright Tobias Schwinger
+# (C) Copyright Tobias Schwinger 
 #
 # Use, modification and distribution are subject to the Boost Software License,
 # Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).

 #-------------------------------------------------------------------------------

-project : requirements <library>/boost/function_types//boost_function_types ;
-
-exe  interpreter_example     : interpreter_example.cpp
-    : <library>/boost/tokenizer//boost_tokenizer
-      <library>/boost/lexical_cast//boost_lexical_cast
-    ;
+exe  interpreter_example     : interpreter_example.cpp ;

 exe  result_of_example       : result_of_example.cpp   ;

 exe  interface_example       : interface_example.cpp   ;

-exe  fast_mem_fn_example     : fast_mem_fn_example.cpp
-    : <include>. # needed for Boost.PP file iteration with some compilers
-      <library>/boost/timer//boost_timer
-      <library>/boost/bind//boost_bind
-    ;
+exe  fast_mem_fn_example     : fast_mem_fn_example.cpp 
+    : <include>. ; # needed for Boost.PP file iteration with some compilers

 exe  macro_type_args_example : macro_type_args_example.cpp ;

--- a/example/fast_mem_fn.hpp
+++ b/example/fast_mem_fn.hpp
@ -62,7 +62,7 @@
 // ============
 //
 // [Dimov1] Dimov, P., Hinnant H., Abrahams, D. The Forwarding Problem
-//          http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
+//          http://std.dkuug.dk/jtc1/sc22/wg21/docs/papers/2002/n1385.htm
 //
 // [Dimov2] Dimov, P. Documentation of boost::mem_fn
 //          http://www.boost.org/libs/bind/mem_fn.html
--- a/example/fast_mem_fn_example.cpp
+++ b/example/fast_mem_fn_example.cpp
@ -13,7 +13,7 @@
 #include <algorithm>
 #include <functional>

-#include <boost/timer/timer.hpp>
+#include <boost/timer.hpp>
 #include <boost/mem_fn.hpp>

 #include "fast_mem_fn.hpp"
@ -91,28 +91,28 @@ template<typename F> void do_test(test_vector & v, F criterion)
 int main()
 {
  test_vector v;
-  boost::timer::cpu_timer t;
+  boost::timer t;
  double time1, time2;

  std::cout << 
      "Test case: sorting " << N << " objects.\n\n"
-      "Criterion accessor called with | elapsed seconds\n"
+      "Criterion accessor called with | elasped seconds\n"
      "-------------------------------|----------------" << std::endl;

  setup_test(v);
-  t.start();
+  t.restart();
 #if !BOOST_WORKAROUND(BOOST_MSVC, < 1400)
  do_test(v, BOOST_EXAMPLE_FAST_MEM_FN(& test::id));
 #else // MSVC<8 does not like the implementation of the deduction macro:
  do_test(v, ::example::fast_mem_fn< int (test::*)() const, & test::id >());
 #endif
-  time1 = t.elapsed().wall * 1e-9;
+  time1 = t.elapsed();
  std::cout << "fast_mem_fn                    | " << time1 << std::endl;

  setup_test(v);
-  t.start();
+  t.restart();
  do_test(v, boost::mem_fn(& test::id));
-  time2 = t.elapsed().wall * 1e-9;
+  time2 = t.elapsed();
  std::cout << "mem_fn                         | " << time2 << std::endl;

  std::cout << '\n' << (time2/time1-1)*100 << "% speedup" << std::endl;
--- a/example/result_of.hpp
+++ b/example/result_of.hpp
@ -26,7 +26,7 @@
 //
 // [Gregor02] Gregor, D. A uniform method for computing function object return
 //            types (revision 1)
-//            http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2003/n1454.html
+//            http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1454.html

 #include <boost/function_types/result_type.hpp>
 #include <boost/function_types/is_callable_builtin.hpp>
@ -57,7 +57,7 @@ namespace example
      typedef typename F::template result<Desc>::type type;
    };

-#if !BOOST_WORKAROUND(BOOST_BORLANDC,BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x564))
    template<typename F> 
    struct result_member_template< F, F(void) > 
    { 
--- a/include/boost/function_types/components.hpp
+++ b/include/boost/function_types/components.hpp
@ -15,6 +15,7 @@

 #include <boost/detail/workaround.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/type_traits/integral_constant.hpp>

@ -22,7 +23,7 @@
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/vector/vector0.hpp>

-#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
+#if BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
 #   include <boost/type_traits/remove_cv.hpp>

 #   include <boost/mpl/identity.hpp>
@ -46,6 +47,7 @@

 #include <boost/function_types/config/config.hpp>

+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #   if   BOOST_FT_MAX_ARITY < 10
 #     include <boost/mpl/vector/vector10.hpp>
 #   elif BOOST_FT_MAX_ARITY < 20
@ -57,6 +59,9 @@
 #   elif BOOST_FT_MAX_ARITY < 50
 #     include <boost/mpl/vector/vector50.hpp>
 #   endif
+#else
+#   include <boost/function_types/detail/classifier.hpp>
+#endif

 #include <boost/function_types/detail/class_transform.hpp>
 #include <boost/function_types/property_tags.hpp>
@ -76,14 +81,14 @@ namespace boost
    namespace detail 
    {
      template<typename T, typename L> struct components_impl;
-#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
+#if BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
      template<typename T, typename OrigT, typename L> struct components_bcc;
 #endif
    }

    template<typename T, typename ClassTypeTransform> 
    struct components
-#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
+#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
      : detail::components_impl<T, ClassTypeTransform>
 #else
      : detail::components_bcc<typename remove_cv<T>::type,T,
@ -255,7 +260,7 @@ namespace boost
          typename detail::class_transform<C,L>::type > types;
    };

-#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x565)
+#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x565)
 #   define BOOST_FT_variations BOOST_FT_pointer|BOOST_FT_member_pointer

    template<typename T, class C, typename L>
@ -415,6 +420,8 @@ namespace boost

  } } // namespace function_types::detail

+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::components)
+
 } // namespace ::boost

 #include <boost/function_types/detail/components_as_mpl_sequence.hpp>
--- a/include/boost/function_types/config/compiler.hpp
+++ b/include/boost/function_types/config/compiler.hpp
@ -91,11 +91,11 @@
 #     define __fastcall __attribute__((__fastcall__))
 #   endif

-#elif defined(BOOST_BORLANDC)
+#elif defined(__BORLANDC__)

-#   if BOOST_BORLANDC < 0x550
+#   if __BORLANDC__ < 0x550
 #     error "unsupported compiler version"
-#   elif BOOST_BORLANDC > 0x565
+#   elif __BORLANDC__ > 0x565
 #     pragma message("WARNING: library untested with this compiler version")
 #   endif

--- a/include/boost/function_types/detail/class_transform.hpp
+++ b/include/boost/function_types/detail/class_transform.hpp
@ -28,6 +28,7 @@ struct class_transform
 { typedef typename mpl::apply1<L,T>::type type; };


+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // We can short-circuit the mechanism implemented in the primary template for 
 // the most common lambda expression and save both the "un-lambdaing" and the
 // type traits invocation (we know that T can only be a class type).
@ -52,6 +53,7 @@ template<typename T> struct class_transform< T, add_pointer< remove_cv<_> > >

 template<typename T, typename U> struct class_transform< T, mpl::always<U> >
 { typedef U type; };
+#endif


 } } } // namespace ::boost::function_types::detail
--- a/include/boost/function_types/detail/classifier.hpp
+++ b/include/boost/function_types/detail/classifier.hpp
@ -11,6 +11,7 @@

 #include <boost/type.hpp>
 #include <boost/config.hpp>
+#include <boost/type_traits/config.hpp>
 #include <boost/type_traits/is_reference.hpp>
 #include <boost/type_traits/add_reference.hpp>

@ -30,13 +31,7 @@ template<bits_t Flags, bits_t CCID, std::size_t Arity> struct encode_charr
  >::type type;
 };

-#if defined(BOOST_MSVC) || (defined(BOOST_BORLANDC) && !defined(BOOST_DISABLE_WIN32))
-#   define BOOST_FT_DECL __cdecl
-#else
-#   define BOOST_FT_DECL /**/
-#endif
-
-char BOOST_FT_DECL classifier_impl(...);
+char BOOST_TT_DECL classifier_impl(...);

 #define BOOST_FT_variations BOOST_FT_function|BOOST_FT_pointer|\
                            BOOST_FT_member_pointer
--- a/include/boost/function_types/detail/cv_traits.hpp
+++ b/include/boost/function_types/detail/cv_traits.hpp
@ -12,7 +12,8 @@
 #include <cstddef>
 #include <boost/detail/workaround.hpp>

-#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)
+#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@ -22,7 +23,8 @@

 namespace boost { namespace function_types { namespace detail {

-#if !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x582)
+#if ! (defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
+    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582))

 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };
--- a/include/boost/function_types/detail/to_sequence.hpp
+++ b/include/boost/function_types/detail/to_sequence.hpp
@ -32,12 +32,14 @@ struct to_sequence
  type;
 };

+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // reduce template instantiations, if possible
 template<typename T, typename U>
 struct to_sequence< components<T,U> > 
 {
  typedef typename components<T,U>::types type;
 };
+#endif

 } } } // namespace ::boost::function_types::detail

--- a/include/boost/function_types/function_arity.hpp
+++ b/include/boost/function_types/function_arity.hpp
@ -13,6 +13,7 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/is_callable_builtin.hpp>
 #include <boost/function_types/components.hpp>
@ -30,6 +31,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,function_arity,(T)) 
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::function_arity)
 }

 #endif
--- a/include/boost/function_types/function_pointer.hpp
+++ b/include/boost/function_types/function_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/function_type.hpp>

@ -24,6 +25,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_pointer,(Types,Tag))
    };
  } 
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_pointer)
 } 

 #endif
--- a/include/boost/function_types/function_reference.hpp
+++ b/include/boost/function_types/function_reference.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_FUNCTION_REFERENCE_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/function_type.hpp>

@ -24,6 +25,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_reference,(Types,Tag))
    };
  } 
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_reference)
 } 

 #endif
--- a/include/boost/function_types/function_type.hpp
+++ b/include/boost/function_types/function_type.hpp
@ -22,6 +22,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,function_type,(Types,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::function_type)
 }

 #endif
--- a/include/boost/function_types/is_callable_builtin.hpp
+++ b/include/boost/function_types/is_callable_builtin.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_CALLABLE_BUILTIN_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,6 +28,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_callable_builtin,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_callable_builtin)
 }

 #endif
--- a/include/boost/function_types/is_function.hpp
+++ b/include/boost/function_types/is_function.hpp
@ -9,6 +9,7 @@
 #define BOOST_FT_IS_FUNCTION_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -26,6 +27,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function)
 } 

 #endif
--- a/include/boost/function_types/is_function_pointer.hpp
+++ b/include/boost/function_types/is_function_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,6 +28,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_pointer,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_pointer)
 }

 #endif
--- a/include/boost/function_types/is_function_reference.hpp
+++ b/include/boost/function_types/is_function_reference.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_FUNCTION_REFERENCE_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -26,6 +27,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_function_reference,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_function_reference)
 } 

 #endif
--- a/include/boost/function_types/is_member_function_pointer.hpp
+++ b/include/boost/function_types/is_member_function_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_MEMBER_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -26,6 +27,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_function_pointer,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_function_pointer)
 } 
 #endif 

--- a/include/boost/function_types/is_member_object_pointer.hpp
+++ b/include/boost/function_types/is_member_object_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_MEMBER_OBJECT_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -26,6 +27,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_member_object_pointer,(T))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::is_member_object_pointer)
 } 

 #endif 
--- a/include/boost/function_types/is_member_pointer.hpp
+++ b/include/boost/function_types/is_member_pointer.hpp
@ -9,6 +9,7 @@
 #define BOOST_FT_IS_MEMBER_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -26,6 +27,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_member_pointer,(T,Tag))
    };
  } 
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_member_pointer)
 } 

 #endif
--- a/include/boost/function_types/is_nonmember_callable_builtin.hpp
+++ b/include/boost/function_types/is_nonmember_callable_builtin.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_IS_NONMEMBER_CALLABLE_BUILTIN_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/components.hpp>

@ -27,6 +28,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,is_nonmember_callable_builtin,(T,Tag))
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::is_nonmember_callable_builtin)
 } 

 #endif 
--- a/include/boost/function_types/member_function_pointer.hpp
+++ b/include/boost/function_types/member_function_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_MEMBER_FUNCTION_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/detail/synthesize.hpp>
 #include <boost/function_types/detail/to_sequence.hpp>
@ -25,6 +26,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,member_function_pointer,(Types,Tag))
    };
  } 
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::member_function_pointer)
 } 

 #endif
--- a/include/boost/function_types/member_object_pointer.hpp
+++ b/include/boost/function_types/member_object_pointer.hpp
@ -10,6 +10,7 @@
 #define BOOST_FT_MEMBER_OBJECT_POINTER_HPP_INCLUDED

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/function_types/detail/synthesize.hpp>
 #include <boost/function_types/detail/to_sequence.hpp>
@ -25,6 +26,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,member_object_pointer,(Types))
    };
  } 
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::member_object_pointer)
 } 

 #endif
--- a/include/boost/function_types/parameter_types.hpp
+++ b/include/boost/function_types/parameter_types.hpp
@ -13,6 +13,7 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/mpl/pop_front.hpp>

@ -47,6 +48,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(2,parameter_types,(T,ClassTypeTransform)) 
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(2,function_types::parameter_types)
 }

 #endif
--- a/include/boost/function_types/property_tags.hpp
+++ b/include/boost/function_types/property_tags.hpp
@ -12,7 +12,6 @@
 #include <cstddef>

 #include <boost/type_traits/integral_constant.hpp>
-#include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/bitxor.hpp>


@ -103,6 +102,7 @@ struct tag
        detail::compound_tag<Tag3,Tag4> >
 { };

+#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 template<class Tag1, class Tag2, class Tag3> struct tag<Tag1,Tag2,Tag3,null_tag>
  : detail::compound_tag<detail::compound_tag<Tag1,Tag2>,Tag3>
 { };
@ -112,6 +112,7 @@ template<class Tag1, class Tag2> struct tag<Tag1,Tag2,null_tag,null_tag>
 template<class Tag1> struct tag<Tag1,null_tag,null_tag,null_tag>
  : Tag1
 { };
+#endif


 template<class Tag, class QueryTag> struct represents
@ -135,20 +136,6 @@ template<class Tag, class QueryTag> struct extract
  > mask; 
 };

-/*
-
-  The following is a metafunction which checks whether a
-  property tag is in a possibly compounded tag type.
-  
-  Here both the possibly compounded tag type and a property tag
-  is given.
-  
-*/
-
-template<class Tag, class PropertyTag> struct has_property_tag
-  : detail::represents_impl<Tag,  PropertyTag>
-{ };
-
 } } // namespace ::boost::function_types

 #include <boost/function_types/detail/pp_tags/preprocessed.hpp>
@ -156,43 +143,6 @@ template<class Tag, class PropertyTag> struct has_property_tag
 namespace boost { namespace function_types {
 #define BOOST_FT_cc_file <boost/function_types/detail/pp_tags/cc_tag.hpp>
 #include <boost/function_types/detail/pp_loop.hpp>
-
-/*
-
-  The following are metafunctions which check whether the
-  specific property tag is in a possibly compounded tag type.
-  Here only the possibly compounded tag type is given.
-  
-*/
-
-template<class Tag> struct has_property_tag<Tag,null_tag>
-  : ::boost::is_same<Tag, null_tag>
-{ };
-
-template<class Tag> struct has_variadic_property_tag
-  : has_property_tag<Tag,  variadic>
-{ };
-
-template<class Tag> struct has_default_cc_property_tag
-  : has_property_tag<Tag,  default_cc>
-{ };
-
-template<class Tag> struct has_const_property_tag
-  : has_property_tag<Tag,  const_qualified>
-{ };
-
-template<class Tag> struct has_volatile_property_tag
-  : has_property_tag<Tag,  volatile_qualified>
-{ };
-
-template<class Tag> struct has_cv_property_tag
-  : has_property_tag<Tag,  cv_qualified>
-{ };
-
-template<class Tag> struct has_null_property_tag
-  : has_property_tag<Tag,  null_tag>
-{ };
-
 } } // namespace boost::function_types

 #endif
--- a/include/boost/function_types/result_type.hpp
+++ b/include/boost/function_types/result_type.hpp
@ -13,6 +13,7 @@
 #include <boost/mpl/if.hpp>

 #include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/type_traits/detail/template_arity_spec.hpp>

 #include <boost/mpl/at.hpp>

@ -42,6 +43,7 @@ namespace boost
      BOOST_MPL_AUX_LAMBDA_SUPPORT(1,result_type,(T)) 
    };
  }
+  BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1,function_types::result_type)
 }

 #endif
--- a/meta/libraries.json
+++ b/meta/libraries.json
@ -1,16 +0,0 @@
-{
-    "key": "function_types",
-    "name": "Function Types",
-    "authors": [
-        "Tobias Schwinger"
-    ],
-    "description": "Boost.FunctionTypes provides functionality to classify, decompose and synthesize function, function pointer, function reference and pointer to member types.",
-    "category": [
-        "Generic",
-        "Metaprogramming"
-    ],
-    "maintainers": [
-        "Tobias Schwinger <tschwinger -at- isonews2.com>"
-    ],
-    "cxxstd": "03"
-}
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,11 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::function_types Boost::core)
-
-endif()
--- a/test/Jamfile
+++ b/test/Jamfile
@ -1,5 +1,5 @@

-# (C) Copyright Tobias Schwinger
+# (C) Copyright Tobias Schwinger 
 #
 # Use, modification and distribution are subject to the Boost Software License,
 # Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
@ -8,78 +8,78 @@

 import testing ;

-project : requirements <library>/boost/function_types//boost_function_types ;
+{
+  test-suite function_types : 

-# Classification
+    # Classification

-compile classification/is_function.cpp ;
-compile classification/is_function_pointer.cpp ;
-compile classification/is_function_reference.cpp ;
-compile classification/is_member_function_pointer.cpp ;
-compile classification/is_member_object_pointer.cpp ;
-compile classification/is_callable_builtin.cpp ;
-compile classification/is_nonmember_callable_builtin.cpp ;
-compile classification/is_member_pointer.cpp ;
+    [ compile classification/is_function.cpp ]
+    [ compile classification/is_function_pointer.cpp ]
+    [ compile classification/is_function_reference.cpp ]
+    [ compile classification/is_member_function_pointer.cpp ]
+    [ compile classification/is_member_object_pointer.cpp ]
+    [ compile classification/is_callable_builtin.cpp ]
+    [ compile classification/is_nonmember_callable_builtin.cpp ]
+    [ compile classification/is_member_pointer.cpp ]

-compile classification/is_cv_mem_func_ptr.cpp ;
-compile classification/is_variadic.cpp ;
-compile classification/is_cv_pointer.cpp ;
-# compile classification/is_cv_function.cpp ;
+    [ compile classification/is_cv_mem_func_ptr.cpp ]
+    [ compile classification/is_variadic.cpp ]
+    [ compile classification/is_cv_pointer.cpp ]
+    # [ compile classification/is_cv_function.cpp ]

-# Decomposition
+    # Decomposition
+    
+    [ compile decomposition/components.cpp ]
+    [ compile decomposition/result_type.cpp ]
+    [ compile decomposition/function_arity.cpp ]
+    [ compile decomposition/parameter_types.cpp ]

-compile decomposition/components.cpp ;
-compile decomposition/result_type.cpp ;
-compile decomposition/function_arity.cpp ;
-compile decomposition/parameter_types.cpp ;
+    [ compile decomposition/components_seq.cpp ]
+    [ compile decomposition/class_type_transform.cpp ]

-compile decomposition/components_seq.cpp ;
-compile decomposition/class_type_transform.cpp ;
+    [ compile-fail decomposition/result_type_fail.cpp ]
+    [ compile-fail decomposition/parameter_types_fail.cpp ]
+    [ compile-fail decomposition/function_arity_fail.cpp ]

-compile-fail decomposition/result_type_fail.cpp ;
-compile-fail decomposition/parameter_types_fail.cpp ;
-compile-fail decomposition/function_arity_fail.cpp ;
+    # Synthesis

-# Synthesis
+    [ compile synthesis/function_type.cpp ]
+    [ compile synthesis/function_pointer.cpp ]
+    [ compile synthesis/function_reference.cpp ]
+    [ compile synthesis/member_function_pointer.cpp ]
+    [ compile synthesis/member_object_pointer.cpp ]

-compile synthesis/function_type.cpp ;
-compile synthesis/function_pointer.cpp ;
-compile synthesis/function_reference.cpp ;
-compile synthesis/member_function_pointer.cpp ;
-compile synthesis/member_object_pointer.cpp ;
+    [ compile synthesis/transformation.cpp ]
+    [ compile synthesis/mem_func_ptr_cv1.cpp ]
+    [ compile synthesis/mem_func_ptr_cv2.cpp ]
+    [ compile synthesis/mem_func_ptr_cv_ptr_to_this.cpp ]
+    [ compile synthesis/variadic_function_synthesis.cpp ]
+    # [ compile synthesis/cv_function_synthesis.cpp ]

-compile synthesis/transformation.cpp ;
-compile synthesis/mem_func_ptr_cv1.cpp ;
-compile synthesis/mem_func_ptr_cv2.cpp ;
-compile synthesis/mem_func_ptr_cv_ptr_to_this.cpp ;
-compile synthesis/variadic_function_synthesis.cpp ;
-# compile synthesis/cv_function_synthesis.cpp ;
+    # Reconfiguration

-# Reconfiguration
+    [ compile reconfiguration/preprocessing_mode.cpp ]
+    [ compile reconfiguration/partial_arity_preprocessing.cpp ]
+    [ compile reconfiguration/cc_preprocessing.cpp ]

-compile reconfiguration/preprocessing_mode.cpp ;
-compile reconfiguration/partial_arity_preprocessing.cpp ;
-compile reconfiguration/cc_preprocessing.cpp ;
+    # Custom calling conventions

-# Custom calling conventions
+    [ compile custom_ccs/nonmember_ccs.cpp ]
+    [ compile custom_ccs/nonmember_ccs_exact.cpp ]
+    [ compile custom_ccs/member_ccs.cpp ]
+    [ compile custom_ccs/member_ccs_exact.cpp ]

-compile custom_ccs/nonmember_ccs.cpp ;
-compile custom_ccs/nonmember_ccs_exact.cpp ;
-compile custom_ccs/member_ccs.cpp ;
-compile custom_ccs/member_ccs_exact.cpp ;
+    # Code from the examples

-# Property tag
+    [ compile ../example/interpreter_example.cpp ]
+    [ compile ../example/result_of_example.cpp ]
+    [ compile ../example/interface_example.cpp ]
+    [ compile ../example/fast_mem_fn_example.cpp 
+      # needed for Boost.PP file iteration with some compilers
+      : <include>../example
+    ]
+    [ compile ../example/macro_type_args_example.cpp ]
+    ;
+}

-compile custom_ccs/property_tag.cpp ;

-# Code from the examples
-
-compile ../example/interpreter_example.cpp : <library>/boost/tokenizer//boost_tokenizer <library>/boost/lexical_cast//boost_lexical_cast ;
-compile ../example/result_of_example.cpp ;
-compile ../example/interface_example.cpp ;
-
-compile ../example/fast_mem_fn_example.cpp : <library>/boost/timer//boost_timer <library>/boost/bind//boost_bind
-  # needed for Boost.PP file iteration with some compilers
-  <include>../example ;
-
-compile ../example/macro_type_args_example.cpp ;
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@ -1,17 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(cmake_install_test LANGUAGES CXX)
-
-find_package(boost_function_types REQUIRED)
-
-add_executable(main main.cpp)
-target_link_libraries(main Boost::function_types)
-
-enable_testing()
-add_test(main main)
-
-add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_install_test/main.cpp
+++ b/test/cmake_install_test/main.cpp
@ -1,14 +0,0 @@
-// Copyright 2017, 2021 Peter Dimov.
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/function_types/function_arity.hpp>
-#include <cassert>
-
-#define BOOST_TEST(expr) assert(expr)
-#define BOOST_TEST_EQ(x1, x2) assert((x1)==(x2))
-
-int main()
-{
-    BOOST_TEST_EQ( boost::function_types::function_arity<void(int, int)>::value, 2 );
-}
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@ -1,46 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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
-
-cmake_minimum_required(VERSION 3.5...3.20)
-
-project(cmake_subdir_test LANGUAGES CXX)
-
-add_subdirectory(../.. boostorg/function_types)
-
-set(deps
-
-# Primary dependencies
-
-config
-core
-detail
-mpl
-preprocessor
-type_traits
-
-# Secondary dependencies
-
-assert
-static_assert
-throw_exception
-predef
-utility
-io
-)
-
-foreach(dep IN LISTS deps)
-
-  add_subdirectory(../../../${dep} boostorg/${dep})
-
-endforeach()
-
-# --target check
-
-add_executable(main main.cpp)
-target_link_libraries(main Boost::function_types)
-
-enable_testing()
-add_test(main main)
-
-add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/main.cpp
+++ b/test/cmake_subdir_test/main.cpp
@ -1,14 +0,0 @@
-// Copyright 2017, 2021 Peter Dimov.
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/function_types/function_arity.hpp>
-#include <cassert>
-
-#define BOOST_TEST(expr) assert(expr)
-#define BOOST_TEST_EQ(x1, x2) assert((x1)==(x2))
-
-int main()
-{
-    BOOST_TEST_EQ( boost::function_types::function_arity<void(int, int)>::value, 2 );
-}
--- a/test/custom_ccs/member_ccs.cpp
+++ b/test/custom_ccs/member_ccs.cpp
@ -6,20 +6,6 @@

 //------------------------------------------------------------------------------

-#if !defined(_M_IX86)
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is not defined")
-
-#elif defined(__clang__)
-
-// Clang-cl 32 bit supports __stdcall, but BOOST_FT_CC_STDCALL isn't defined so the test errors out
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is defined, but __clang__ is also defined")
-
-#else
-
 #define BOOST_FT_AUTODETECT_CALLING_CONVENTIONS

 #include <boost/mpl/assert.hpp>
@ -62,4 +48,3 @@ BOOST_MPL_ASSERT((
  >
 ));

-#endif
--- a/test/custom_ccs/member_ccs_exact.cpp
+++ b/test/custom_ccs/member_ccs_exact.cpp
@ -6,20 +6,6 @@

 //------------------------------------------------------------------------------

-#if !defined(_M_IX86)
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is not defined")
-
-#elif defined(__clang__)
-
-// Clang-cl 32 bit supports __stdcall, but BOOST_FT_CC_STDCALL isn't defined so the test errors out
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is defined, but __clang__ is also defined")
-
-#else
-
 #define BOOST_FT_AUTODETECT_CALLING_CONVENTIONS

 #include <boost/mpl/assert.hpp>
@ -83,4 +69,3 @@ BOOST_MPL_ASSERT_NOT((
  ft::is_callable_builtin< ft::member_function_pointer<mpl::vector<int, C &>, cc>::type, dc >
 ));

-#endif
--- a/test/custom_ccs/nonmember_ccs.cpp
+++ b/test/custom_ccs/nonmember_ccs.cpp
@ -6,20 +6,6 @@

 //------------------------------------------------------------------------------

-#if !defined(_M_IX86)
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is not defined")
-
-#elif defined(__clang__)
-
-// Clang-cl 32 bit supports __stdcall, but BOOST_FT_CC_STDCALL isn't defined so the test errors out
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is defined, but __clang__ is also defined")
-
-#else
-
 #define BOOST_FT_AUTODETECT_CALLING_CONVENTIONS

 #include <boost/mpl/assert.hpp>
@ -57,4 +43,3 @@ BOOST_MPL_ASSERT((
  >
 ));

-#endif
--- a/test/custom_ccs/nonmember_ccs_exact.cpp
+++ b/test/custom_ccs/nonmember_ccs_exact.cpp
@ -6,20 +6,6 @@

 //------------------------------------------------------------------------------

-#if !defined(_M_IX86)
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is not defined")
-
-#elif defined(__clang__)
-
-// Clang-cl 32 bit supports __stdcall, but BOOST_FT_CC_STDCALL isn't defined so the test errors out
-
-#include <boost/config/pragma_message.hpp>
-BOOST_PRAGMA_MESSAGE("Test skipped because _M_IX86 is defined, but __clang__ is also defined")
-
-#else
-
 #define BOOST_FT_AUTODETECT_CALLING_CONVENTIONS

 #include <boost/mpl/assert.hpp>
@ -72,4 +58,5 @@ BOOST_MPL_ASSERT_NOT((
  ft::is_callable_builtin< ft::function_pointer<mpl::vector<void> >::type, cc >
 ));

-#endif
+
+
--- a/test/custom_ccs/property_tag.cpp
+++ b/test/custom_ccs/property_tag.cpp
@ -1,64 +0,0 @@
-
-//  (C) Copyright Edward Diener 2019
-//  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).
-
-//------------------------------------------------------------------------------
-
-#include <boost/mpl/assert.hpp>
-#include <boost/function_types/property_tags.hpp>
-
-namespace ft = boost::function_types;
-namespace mpl = boost::mpl;
-
-typedef ft::tag<ft::variadic,ft::non_volatile,ft::non_const,ft::default_cc> tag1;
-typedef ft::tag<ft::const_non_volatile,ft::const_qualified> tag2;
-typedef ft::tag<ft::cv_qualified,ft::variadic> tag3;
-typedef ft::null_tag tag4;
-typedef ft::tag<ft::variadic,ft::volatile_non_const> tag5;
-typedef ft::tag<ft::volatile_qualified,ft::non_const,ft::variadic> tag6;
-typedef ft::tag<ft::non_variadic,ft::const_non_volatile,ft::default_cc> tag7;
-typedef ft::tag<ft::non_cv,ft::default_cc> tag8;
-    
-BOOST_MPL_ASSERT((ft::has_property_tag<tag1, ft::variadic>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag2, ft::const_qualified>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag3, ft::cv_qualified>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag4, ft::null_tag>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag5, ft::volatile_qualified>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag6, ft::volatile_qualified>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag7, ft::const_qualified>));
-BOOST_MPL_ASSERT((ft::has_property_tag<tag8, ft::default_cc>));
-
-BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag1>));
-BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag3>));
-BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag5>));
-BOOST_MPL_ASSERT((ft::has_variadic_property_tag<tag6>));
-BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag1>));
-BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag7>));
-BOOST_MPL_ASSERT((ft::has_default_cc_property_tag<tag8>));
-BOOST_MPL_ASSERT((ft::has_const_property_tag<tag2>));
-BOOST_MPL_ASSERT((ft::has_const_property_tag<tag3>));
-BOOST_MPL_ASSERT((ft::has_const_property_tag<tag7>));
-BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag3>));
-BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag5>));
-BOOST_MPL_ASSERT((ft::has_volatile_property_tag<tag6>));
-BOOST_MPL_ASSERT((ft::has_cv_property_tag<tag3>));
-BOOST_MPL_ASSERT((ft::has_null_property_tag<tag4>));
-
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag1, ft::const_qualified>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag2, ft::cv_qualified>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag3, ft::null_tag>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag4, ft::volatile_qualified>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag5, ft::const_qualified>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag6, ft::default_cc>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag7, ft::variadic>));
-BOOST_MPL_ASSERT_NOT((ft::has_property_tag<tag8, ft::volatile_qualified>));
-
-BOOST_MPL_ASSERT_NOT((ft::has_variadic_property_tag<tag2>));
-BOOST_MPL_ASSERT_NOT((ft::has_default_cc_property_tag<tag6>));
-BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag4>));
-BOOST_MPL_ASSERT_NOT((ft::has_const_property_tag<tag5>));
-BOOST_MPL_ASSERT_NOT((ft::has_volatile_property_tag<tag7>));
-BOOST_MPL_ASSERT_NOT((ft::has_cv_property_tag<tag1>));
-BOOST_MPL_ASSERT_NOT((ft::has_null_property_tag<tag8>));