Fix some XML validation errors (#60)

Relates #59

.drone.star

@@ -0,0 +1,38 @@
+# Use, modification, and distribution are
+# subject to the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE.txt)
+#
+# Copyright Rene Rivera 2020.
+
+# For Drone CI we use the Starlark scripting language to reduce duplication.
+# As the yaml syntax for Drone CI is rather limited.
+#
+#
+globalenv={'B2_VARIANT': 'variant=release,debug'}
+linuxglobalimage="cppalliance/droneubuntu1404:1"
+windowsglobalimage="cppalliance/dronevs2019"
+
+def main(ctx):
+  return [
+  linux_cxx("TOOLSET=gcc-4.4 CXXSTD=98,0x Job 0", "g++", packages="g++-4.4", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-4.4', 'CXXSTD': '98,0x', 'DRONE_JOB_UUID': 'b6589fc6ab'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-4.6 CXXSTD=03,0x Job 1", "g++", packages="g++-4.6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-4.6', 'CXXSTD': '03,0x', 'DRONE_JOB_UUID': '356a192b79'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-4.8 CXXSTD=03,11 Job 2", "g++", packages="g++-4.8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-4.8', 'CXXSTD': '03,11', 'DRONE_JOB_UUID': 'da4b9237ba'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-5 CXXSTD=03,11 Job 3", "g++", packages="g++-5", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-5', 'CXXSTD': '03,11', 'DRONE_JOB_UUID': '77de68daec'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-6 CXXSTD=03,11,14 Job 4", "g++", packages="g++-6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-6', 'CXXSTD': '03,11,14', 'DRONE_JOB_UUID': '1b64538924'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-7 CXXSTD=03,11,14,17 Job 5", "g++", packages="g++-7", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-7', 'CXXSTD': '03,11,14,17', 'DRONE_JOB_UUID': 'ac3478d69a'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=gcc-8 CXXSTD=03,11,14,17,2a Job 6", "g++", packages="g++-8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'gcc-8', 'CXXSTD': '03,11,14,17,2a', 'DRONE_JOB_UUID': 'c1dfd96eea'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-3.4 CXXSTD=03,11 Job 7", "g++", packages="clang-3.4", llvm_os="trusty", llvm_ver="3.4", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-3.4', 'CXXSTD': '03,11', 'DRONE_JOB_UUID': '902ba3cda1'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-3.8 CXXSTD=03,11,14 Job 8", "g++", packages="clang-3.8 libstdc++-6-dev", llvm_os="trusty", llvm_ver="3.8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-3.8', 'CXXSTD': '03,11,14', 'DRONE_JOB_UUID': 'fe5dbbcea5'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-4.0 CXXSTD=03,11,14 Job 9", "g++", packages="clang-4.0 libstdc++-6-dev", llvm_os="trusty", llvm_ver="4.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-4.0', 'CXXSTD': '03,11,14', 'DRONE_JOB_UUID': '0ade7c2cf9'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-5.0 CXXSTD=03,11,14,17 Job 10", "g++", packages="clang-5.0 libstdc++-7-dev", llvm_os="trusty", llvm_ver="5.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-5.0', 'CXXSTD': '03,11,14,17', 'DRONE_JOB_UUID': 'b1d5781111'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-6.0 CXXSTD=03,11,14,17,2a Job 11", "g++", packages="clang-6.0 libc++-dev libstdc++-8-dev valgrind", llvm_os="trusty", llvm_ver="6.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-6.0', 'CXXSTD': '03,11,14,17,2a', 'DRONE_JOB_UUID': '17ba079149'}, globalenv=globalenv),
+  linux_cxx("TOOLSET=clang-6.0 CXXSTD=03,11,14,17,2a Job 12", "g++", packages="clang-6.0 libc++-dev libstdc++-8-dev valgrind", llvm_os="trusty", llvm_ver="6.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'TOOLSET': 'clang-6.0', 'CXXSTD': '03,11,14,17,2a', 'CXXFLAGS': '-stdlib=libc++', 'DRONE_JOB_UUID': '7b52009b64'}, globalenv=globalenv),
+  linux_cxx("COMMENT=codecov.io TOOLSET=gcc-7 DEFINES=def Job 13", "g++", packages="g++-7", buildtype="6d5a3a255d-bbb3de2b00", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'codecov.io', 'TOOLSET': 'gcc-7', 'DEFINES': 'define=BOOST_NO_STRESS_TEST=1', 'DRONE_JOB_UUID': 'bd307a3ec3'}, globalenv=globalenv),
+  linux_cxx("COMMENT=cppcheck Job 14", "g++", packages="binutils-gold gdb libc6-dbg", buildtype="6d5a3a255d-ed45733e6c", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'cppcheck', 'DRONE_JOB_UUID': 'fa35e19212'}, globalenv=globalenv),
+  linux_cxx("COMMENT=ubsan B2_VARIANT=variant=debug TOOLSE Job 15", "g++", packages="g++-8", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'ubsan', 'B2_VARIANT': 'variant=debug', 'TOOLSET': 'gcc-8', 'CXXSTD': '03,11,14,17,2a', 'DEFINES': 'define=BOOST_NO_STRESS_TEST=1', 'CXXFLAGS': 'cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined', 'LINKFLAGS': 'linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=undefined linkflags=-fuse-ld=gold', 'UBSAN_OPTIONS': 'print_stacktrace=1', 'DRONE_JOB_UUID': 'f1abd67035'}, globalenv=globalenv),
+  linux_cxx("COMMENT=valgrind TOOLSET=clang-6.0 CXXSTD=03, Job 16", "g++", packages="clang-6.0 libc++-dev libstdc++-8-dev valgrind", llvm_os="trusty", llvm_ver="6.0", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'valgrind', 'TOOLSET': 'clang-6.0', 'CXXSTD': '03,11,14,17,2a', 'DEFINES': 'define=BOOST_NO_STRESS_TEST=1', 'B2_VARIANT': 'variant=debug', 'TESTFLAGS': 'testing.launcher=valgrind', 'VALGRIND_OPTS': '--error-exitcode=1', 'DRONE_JOB_UUID': '1574bddb75'}, globalenv=globalenv),
+  linux_cxx("COMMENT=Coverity Scan TOOLSET=gcc-7 Job 17", "g++", packages="g++-7", buildtype="6d5a3a255d-cce9827eb5", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'Coverity Scan', 'TOOLSET': 'gcc-7', 'DRONE_JOB_UUID': '0716d9708d'}, globalenv=globalenv),
+    ]
+
+# from https://github.com/boostorg/boost-ci
+load("@boost_ci//ci/drone/:functions.star", "linux_cxx","windows_cxx","osx_cxx","freebsd_cxx")

.drone/drone.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+# Copyright 2020 Rene Rivera, Sam Darwin
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+set -e
+export TRAVIS_BUILD_DIR=$(pwd)
+export DRONE_BUILD_DIR=$(pwd)
+export TRAVIS_BRANCH=$DRONE_BRANCH
+export VCS_COMMIT_ID=$DRONE_COMMIT
+export GIT_COMMIT=$DRONE_COMMIT
+export REPO_NAME=$DRONE_REPO
+export PATH=~/.local/bin:/usr/local/bin:$PATH
+
+if [ "$DRONE_JOB_BUILDTYPE" == "boost" ]; then
+
+echo '==================================> INSTALL'
+
+git clone https://github.com/jeking3/boost-ci.git boost-ci
+cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    unset -f cd
+fi
+
+export SELF=`basename $REPO_NAME`
+export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+export BOOST_CI_SRC_FOLDER=$(pwd)
+
+. ./ci/common_install.sh
+
+echo '==================================> SCRIPT'
+
+cd $BOOST_ROOT/libs/$SELF
+ci/travis/build.sh
+
+elif [ "$DRONE_JOB_BUILDTYPE" == "6d5a3a255d-bbb3de2b00" ]; then
+
+echo '==================================> INSTALL'
+
+git clone https://github.com/jeking3/boost-ci.git boost-ci
+cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    unset -f cd
+fi
+
+export SELF=`basename $REPO_NAME`
+export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+export BOOST_CI_SRC_FOLDER=$(pwd)
+
+. ./ci/common_install.sh
+
+echo '==================================> SCRIPT'
+
+pushd /tmp && git clone https://github.com/linux-test-project/lcov.git && export PATH=/tmp/lcov/bin:$PATH && which lcov && lcov --version && popd
+cd $BOOST_ROOT/libs/$SELF
+ci/travis/codecov.sh
+
+elif [ "$DRONE_JOB_BUILDTYPE" == "6d5a3a255d-ed45733e6c" ]; then
+
+echo '==================================> INSTALL'
+
+git clone https://github.com/jeking3/boost-ci.git boost-ci
+cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    unset -f cd
+fi
+
+export SELF=`basename $REPO_NAME`
+export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+export BOOST_CI_SRC_FOLDER=$(pwd)
+
+. ./ci/common_install.sh
+
+echo '==================================> SCRIPT'
+
+cd $BOOST_ROOT/libs/$SELF
+ci/travis/cppcheck.sh
+
+elif [ "$DRONE_JOB_BUILDTYPE" == "6d5a3a255d-cce9827eb5" ]; then
+
+echo '==================================> INSTALL'
+
+git clone https://github.com/jeking3/boost-ci.git boost-ci
+cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    unset -f cd
+fi
+
+export SELF=`basename $REPO_NAME`
+export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+export BOOST_CI_SRC_FOLDER=$(pwd)
+
+. ./ci/common_install.sh
+
+echo '==================================> SCRIPT'
+
+if  [ -n "${COVERITY_SCAN_NOTIFICATION_EMAIL}" -a \( "$DRONE_BRANCH" = "develop" -o "$DRONE_BRANCH" = "master" \) -a "$DRONE_BUILD_EVENT" = "push" ] ; then
+cd $BOOST_ROOT/libs/$SELF
+ci/travis/coverity.sh
+fi
+
+fi

.github/workflows/ci.yml

@@ -0,0 +1,423 @@
+name: GitHub Actions CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
+      - githubactions*
+      - feature/**
+      - fix/**
+      - pr/**
+
+env:
+    B2_VARIANT: variant=release,debug
+
+jobs:
+  posix:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "TOOLSET=gcc-4.4 CXXSTD=98,0x Job 0"
+            buildtype: "boost"
+            packages: "g++-4.4"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-4.4"
+            cxxstd: "98,0x"
+          - name: "TOOLSET=gcc-4.6 CXXSTD=03,0x Job 1"
+            buildtype: "boost"
+            packages: "g++-4.6"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-4.6"
+            cxxstd: "03,0x"
+          - name: "TOOLSET=gcc-4.8 CXXSTD=03,11 Job 2"
+            buildtype: "boost"
+            packages: "g++-4.8"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-4.8"
+            cxxstd: "03,11"
+          - name: "TOOLSET=gcc-5 CXXSTD=03,11 Job 3"
+            buildtype: "boost"
+            packages: "g++-5"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-5"
+            cxxstd: "03,11"
+          - name: "TOOLSET=gcc-6 CXXSTD=03,11,14 Job 4"
+            buildtype: "boost"
+            packages: "g++-6"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-6"
+            cxxstd: "03,11,14"
+          - name: "TOOLSET=gcc-7 CXXSTD=03,11,14,17 Job 5"
+            buildtype: "boost"
+            packages: "g++-7"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-7"
+            cxxstd: "03,11,14,17"
+          - name: "TOOLSET=gcc-8 CXXSTD=03,11,14,17,2a Job 6"
+            buildtype: "boost"
+            packages: "g++-8"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            toolset: "gcc-8"
+            cxxstd: "03,11,14,17,2a"
+          - name: "TOOLSET=clang-3.4 CXXSTD=03,11 Job 7"
+            buildtype: "boost"
+            packages: "clang-3.4"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "3.4"
+            toolset: "clang-3.4"
+            cxxstd: "03,11"
+          - name: "TOOLSET=clang-3.8 CXXSTD=03,11,14 Job 8"
+            buildtype: "boost"
+            packages: "clang-3.8 libstdc++-6-dev"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "3.8"
+            toolset: "clang-3.8"
+            cxxstd: "03,11,14"
+          - name: "TOOLSET=clang-4.0 CXXSTD=03,11,14 Job 9"
+            buildtype: "boost"
+            packages: "clang-4.0 libstdc++-6-dev"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "4.0"
+            toolset: "clang-4.0"
+            cxxstd: "03,11,14"
+          - name: "TOOLSET=clang-5.0 CXXSTD=03,11,14,17 Job 10"
+            buildtype: "boost"
+            packages: "clang-5.0 libstdc++-7-dev"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "5.0"
+            toolset: "clang-5.0"
+            cxxstd: "03,11,14,17"
+          - name: "TOOLSET=clang-6.0 CXXSTD=03,11,14,17,2a Job 11"
+            buildtype: "boost"
+            packages: "clang-6.0 libc++-dev libstdc++-8-dev valgrind"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "6.0"
+            toolset: "clang-6.0"
+            cxxstd: "03,11,14,17,2a"
+          - name: "TOOLSET=clang-6.0 CXXSTD=03,11,14,17,2a Job 12"
+            buildtype: "boost"
+            packages: "clang-6.0 libc++-dev libstdc++-8-dev valgrind"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "6.0"
+            toolset: "clang-6.0"
+            cxxstd: "03,11,14,17,2a"
+            cxxflags: "-stdlib=libc++"
+          - name: "COMMENT=codecov.io TOOLSET=gcc-7 DEFINES=def Job 13"
+            buildtype: "6d5a3a255d-bbb3de2b00"
+            packages: "g++-7"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            comment: "codecov.io"
+            toolset: "gcc-7"
+            defines: "define=BOOST_NO_STRESS_TEST=1"
+          - name: "COMMENT=cppcheck Job 14"
+            buildtype: "6d5a3a255d-ed45733e6c"
+            packages: "binutils-gold gdb libc6-dbg"
+            packages_to_remove: ""
+            os: "ubuntu-18.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            comment: "cppcheck"
+          - name: "COMMENT=ubsan B2_VARIANT=variant=debug TOOLSE Job 15"
+            buildtype: "boost"
+            packages: "g++-8"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            comment: "ubsan"
+            b2_variant: "variant=debug"
+            toolset: "gcc-8"
+            cxxstd: "03,11,14,17,2a"
+            defines: "define=BOOST_NO_STRESS_TEST=1"
+            cxxflags: "cxxflags=-fno-omit-frame-pointer cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined"
+            linkflags: "linkflags=-fsanitize=undefined linkflags=-fno-sanitize-recover=undefined linkflags=-fuse-ld=gold"
+            ubsan_options: "print_stacktrace=1"
+          - name: "COMMENT=valgrind TOOLSET=clang-6.0 CXXSTD=03, Job 16"
+            buildtype: "boost"
+            packages: "clang-6.0 libc++-dev libstdc++-8-dev valgrind"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:14.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: "trusty"
+            llvm_ver: "6.0"
+            comment: "valgrind"
+            toolset: "clang-6.0"
+            cxxstd: "03,11,14,17,2a"
+            defines: "define=BOOST_NO_STRESS_TEST=1"
+            b2_variant: "variant=debug"
+            testflags: "testing.launcher=valgrind"
+            valgrind_opts: "--error-exitcode=1"
+          - name: "COMMENT=Coverity Scan TOOLSET=gcc-7 Job 17"
+            buildtype: "6d5a3a255d-cce9827eb5"
+            packages: "g++-7"
+            packages_to_remove: ""
+            os: "ubuntu-20.04"
+            container: "ubuntu:16.04"
+            cxx: "g++"
+            sources: ""
+            llvm_os: ""
+            llvm_ver: ""
+            comment: "Coverity Scan"
+            toolset: "gcc-7"
+
+    runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
+
+    steps:
+      - name: Check if running in container
+        if: matrix.container != ''
+        run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
+      - name: If running in container, upgrade packages
+        if: matrix.container != ''
+        run: |
+            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev
+            sudo apt-add-repository ppa:git-core/ppa
+            sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
+            python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
+            sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
+            sudo python3 get-pip.py
+            sudo /usr/local/bin/pip install cmake
+
+      - uses: actions/checkout@v2
+
+      - name: linux
+        shell: bash
+        env:
+          CXX: ${{ matrix.cxx }}
+          SOURCES: ${{ matrix.sources }}
+          LLVM_OS: ${{ matrix.llvm_os }}
+          LLVM_VER: ${{ matrix.llvm_ver }}
+          PACKAGES: ${{ matrix.packages }}
+          PACKAGES_TO_REMOVE: ${{ matrix.packages_to_remove }}
+          JOB_BUILDTYPE: ${{ matrix.buildtype }}
+          TOOLSET: ${{ matrix.toolset }}
+          CXXSTD: ${{ matrix.cxxstd }}
+          CXXFLAGS: ${{ matrix.cxxflags }}
+          COMMENT: ${{ matrix.comment }}
+          DEFINES: ${{ matrix.defines }}
+          B2_VARIANT: ${{ matrix.b2_variant }}
+          LINKFLAGS: ${{ matrix.linkflags }}
+          UBSAN_OPTIONS: ${{ matrix.ubsan_options }}
+          TESTFLAGS: ${{ matrix.testflags }}
+          VALGRIND_OPTS: ${{ matrix.valgrind_opts }}
+          TRAVIS_BRANCH: ${{ github.base_ref }}
+          TRAVIS_OS_NAME: "linux"
+        run: |
+          echo '==================================> SETUP'
+          echo '==================================> PACKAGES'
+          set -e
+          if [ -n "$PACKAGES_TO_REMOVE" ]; then sudo apt-get purge -y $PACKAGES_TO_REMOVE; fi
+          echo ">>>>> APT: REPO.."
+          for i in {1..3}; do sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 2; done
+          
+          if test -n "${LLVM_OS}" ; then
+              wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+              if test -n "${LLVM_VER}" ; then
+                  sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS}-${LLVM_VER} main"
+              else
+                  # Snapshot (i.e. trunk) build of clang
+                  sudo -E apt-add-repository "deb http://apt.llvm.org/${LLVM_OS}/ llvm-toolchain-${LLVM_OS} main"
+              fi
+          fi
+          echo ">>>>> APT: UPDATE.."
+          sudo -E apt-get -o Acquire::Retries=3 update
+          if test -n "${SOURCES}" ; then
+              echo ">>>>> APT: INSTALL SOURCES.."
+              for SOURCE in $SOURCES; do
+                  sudo -E apt-add-repository ppa:$SOURCE
+              done
+          fi
+          echo ">>>>> APT: INSTALL ${PACKAGES}.."
+          sudo -E DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=3 -y --no-install-suggests --no-install-recommends install ${PACKAGES}
+
+          echo '==================================> INSTALL AND COMPILE'
+          set -e
+          export TRAVIS_BUILD_DIR=$(pwd)
+          export TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')}
+          export VCS_COMMIT_ID=$GITHUB_SHA
+          export GIT_COMMIT=$GITHUB_SHA
+          export REPO_NAME=$(basename $GITHUB_REPOSITORY)
+          export USER=$(whoami)
+          export CC=${CC:-gcc}
+          export PATH=~/.local/bin:/usr/local/bin:$PATH
+
+          if [ "$JOB_BUILDTYPE" == "boost" ]; then
+
+          echo '==================================> INSTALL'
+
+          git clone https://github.com/jeking3/boost-ci.git boost-ci
+          cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+          if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+              unset -f cd
+          fi
+
+          export SELF=`basename $REPO_NAME`
+          export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+          export BOOST_CI_SRC_FOLDER=$(pwd)
+
+          . ./ci/common_install.sh
+
+          echo '==================================> SCRIPT'
+
+          cd $BOOST_ROOT/libs/$SELF
+          ci/travis/build.sh
+
+          elif [ "$JOB_BUILDTYPE" == "6d5a3a255d-bbb3de2b00" ]; then
+
+          echo '==================================> INSTALL'
+
+          git clone https://github.com/jeking3/boost-ci.git boost-ci
+          cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+          if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+              unset -f cd
+          fi
+
+          export SELF=`basename $REPO_NAME`
+          export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+          export BOOST_CI_SRC_FOLDER=$(pwd)
+
+          . ./ci/common_install.sh
+
+          echo '==================================> SCRIPT'
+
+          pushd /tmp && git clone https://github.com/linux-test-project/lcov.git && export PATH=/tmp/lcov/bin:$PATH && which lcov && lcov --version && popd
+          cd $BOOST_ROOT/libs/$SELF
+          ci/travis/codecov.sh
+
+          elif [ "$JOB_BUILDTYPE" == "6d5a3a255d-ed45733e6c" ]; then
+
+          echo '==================================> INSTALL'
+
+          git clone https://github.com/jeking3/boost-ci.git boost-ci
+          cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+          if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+              unset -f cd
+          fi
+
+          export SELF=`basename $REPO_NAME`
+          export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+          export BOOST_CI_SRC_FOLDER=$(pwd)
+
+          . ./ci/common_install.sh
+
+          echo '==================================> SCRIPT'
+
+          cd $BOOST_ROOT/libs/$SELF
+          ci/travis/cppcheck.sh
+
+          elif [ "$JOB_BUILDTYPE" == "6d5a3a255d-cce9827eb5" ]; then
+
+          echo '==================================> INSTALL'
+
+          git clone https://github.com/jeking3/boost-ci.git boost-ci
+          cp -pr boost-ci/ci boost-ci/.codecov.yml .
+
+          if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+              unset -f cd
+          fi
+
+          export SELF=`basename $REPO_NAME`
+          export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
+          export BOOST_CI_SRC_FOLDER=$(pwd)
+
+          . ./ci/common_install.sh
+
+          echo '==================================> SCRIPT'
+
+          if  [ -n "${COVERITY_SCAN_NOTIFICATION_EMAIL}" -a \( "$TRAVIS_BRANCH" = "develop" -o "$TRAVIS_BRANCH" = "master" \) -a \("$GITHUB_EVENT_NAME" = "push" -o "$GITHUB_EVENT_NAME" = "cron" \) ] ; then
+          cd $BOOST_ROOT/libs/$SELF
+          ci/travis/coverity.sh
+          fi
+
+          fi

CMakeLists.txt

@@ -1,12 +1,9 @@
 # Copyright 2018 Mike Dev
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
-#
-# NOTE: CMake support for Boost.Mpl is currently experimental at best
-#       and the interface is likely to change in the future
 
-cmake_minimum_required( VERSION 3.5 )
-project( BoostMpl LANGUAGES CXX )
+cmake_minimum_required( VERSION 3.5...3.20 )
+project( boost_mpl VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
 
 add_library( boost_mpl INTERFACE )
 add_library( Boost::mpl ALIAS boost_mpl )
@@ -23,4 +20,3 @@ target_link_libraries( boost_mpl
         Boost::type_traits
         Boost::utility
 )
-

appveyor.yml

@@ -45,6 +45,19 @@ environment:
     B2_VARIANT: variant=release,debug
 
   matrix:
+    - FLAVOR: Visual Studio 2019
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      B2_ADDRESS_MODEL: address-model=64,32
+      CXXSTD: 14,17,latest
+
+    - FLAVOR: Visual Studio 2019 New Preprocessor
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      TOOLSET: msvc-14.2
+      B2_ADDRESS_MODEL: address-model=64,32
+      CXXFLAGS: cxxflags="/Zc:preprocessor"
+      CXXSTD: 14,17,latest
+
     - FLAVOR: Visual Studio 2017 C++2a Strict
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1
@@ -63,14 +76,25 @@ environment:
       TOOLSET: msvc-14.1
       B2_ADDRESS_MODEL: address-model=64,32
 
-    - FLAVOR: Visual Studio 2015 C++14 (Default)
+    - FLAVOR: Visual Studio 2015
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       TOOLSET: msvc-14.0
       B2_ADDRESS_MODEL: address-model=64,32
 
-    - FLAVOR: Visual Studio 2010, 2012, 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0
+    - FLAVOR: Visual Studio 2013
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-12.0
+      B2_ADDRESS_MODEL: address-model=64,32
+
+    - FLAVOR: Visual Studio 2012
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-11.0
+      B2_ADDRESS_MODEL: address-model=32
+
+    - FLAVOR: Visual Studio 2010
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-10.0
+      B2_ADDRESS_MODEL: address-model=32
 
     - FLAVOR: cygwin (32-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -104,7 +128,7 @@ environment:
       ARCH: x86_64
       B2_ADDRESS_MODEL: address-model=64
       CXXSTD: 11,17
-      DEFINES: define=__USE_ISOC99
+      B2_DEFINES: define=__USE_ISOC99
       SCRIPT: ci\appveyor\mingw.bat
 
 install:

doc/refmanual/associative-sequence.html

@@ -25,7 +25,7 @@ unspecified.</p>
 <div class="section" id="id30">
 <h3><a class="subsection-title" href="#definitions" name="definitions">Definitions</a></h3>
 <ul class="simple" id="value-part">
-<span id="key-part"></span><li>A <em>key</em> is a part of the element type used to identify and retrieve
+<li><span id="key-part"></span>A <em>key</em> is a part of the element type used to identify and retrieve
 the element within the sequence.</li>
 <li>A <em>value</em> is a part of the element type retrievied from the sequence
 by its key.</li>

doc/refmanual/get-tag-def.html

@@ -75,12 +75,12 @@ such that for any type <tt class="literal"><span class="pre">x</span></tt> <tt c
 <pre class="last literal-block">
 namespace boost { namespace mpl {</pre>
     <pre class="last literal-block">
-template<typename T>&lt;class T&gt;
+template&lt;class T&gt;
 struct get_##name {
 	typedef typename T::name type;
 };</pre>
     <pre class="last literal-block">
-}}<typename T>
+}}
 </pre>
 </td>
 </tr>
@@ -103,13 +103,13 @@ struct test_type_get_tag_def
 
 }}
 
-typedef boost::mpl::get_a_tag&lt;<test_type_get_tag_def>test_type_get_tag_def&gt;::type   got_the_tag;
+typedef boost::mpl::get_a_tag&lt;test_type_get_tag_def&gt;::type   got_the_tag;
 
 </pre>
 </div>
 <div class="section" id="id1335">
 <h3><a class="subsection-title" href="#see-also" name="see-also">See also</a></h3>
-<p><a class="reference internal" href="./macros.html">Macros</a>, <a class="reference internal" href="./has-xxx-trait-named-def.html">BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF</a>
+<p><a class="reference internal" href="./macros.html">Macros</a>, <a class="reference internal" href="./has-xxx-trait-named-def.html">BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF</a></p>
 <!-- Macros/Introspection/BOOST_MPL_GET_TAG_DEF -->
 </div>
 </div>

doc/refmanual/tag-dispatched-metafunction.html

@@ -126,13 +126,13 @@ struct bitset0
     // ...
 };
 
-template< typename B0 > struct bitset1
+template&lt; typename B0 &gt; struct bitset1
 {
     typedef bitset_tag tag;
     // ...
 };
 
-template< typename B0, <em>...,</em> typename B<em>n</em> &gt; struct bitset<em>n</em>
+template&lt; typename B0, <em>...,</em> typename B<em>n</em> &gt; struct bitset<em>n</em>
 {
     typedef bitset_tag tag;
     // ...

doc/refmanual/terminology.html

@@ -14,7 +14,7 @@
 <div class="section" id="terminology">
 <h1><a class="toc-backref" href="../refmanual.html#id1610">Terminology</a></h1>
 <dl class="docutils" id="overloaded-name">
-<span id="label-terminology"></span><dt>Overloaded name</dt>
+<dt><span id="label-terminology"></span>Overloaded name</dt>
 <dd>Overloaded name is a term used in this reference documentation to designate
 a metafunction providing more than one public interface. In reality,
 class template overloading is nonexistent and the referenced functionality

doc/tutorial/apply-lambda-semantics.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Prev</a>&nbsp;<a href="./iterator-protocol.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group">Back&nbsp;<a href="./iterator-protocol.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./apply-lambda-semantics.html" class="navigation-link">apply/lambda Semantics</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./apply-lambda-semantics.html" class="navigation-link">apply/lambda Semantics</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="apply-lambda-semantics">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id64" name="apply-lambda-semantics"><tt class="literal"><span class="pre">apply</span></tt>/<tt class="literal"><span class="pre">lambda</span></tt> Semantics</a></h1>

doc/tutorial/changelog-history.html

@@ -7,12 +7,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.3.6: http://docutils.sourceforge.net/" />
-<title>THE BOOST MPL LIBRARY: Changelog & History</title>
+<title>THE BOOST MPL LIBRARY: Changelog &amp; History</title>
 <link rel="stylesheet" href="../style.css" type="text/css" />
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./reference-manual.html" class="navigation-link">Prev</a>&nbsp;<a href="./changes-in-boost-1-32-0.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./reference-manual.html" class="navigation-link">Back</a>&nbsp;<a href="./technical-details.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="../index.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="changelog-history">
 <h1><a class="toc-backref" href="../index.html#id62" name="changelog-history">Changelog &amp; History</a></h1>

doc/tutorial/changes-in-boost-1-32-0.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./changelog-history.html" class="navigation-link">Prev</a>&nbsp;<a href="./apply-lambda-semantics.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group">Back&nbsp;Along</span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changelog-history.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="changes-in-boost-1-32-0">
 <h1><a class="toc-backref" href="./changelog-history.html#id63" name="changes-in-boost-1-32-0">Changes in Boost 1.32.0 Release</a></h1>

doc/tutorial/iterator-protocol.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./apply-lambda-semantics.html" class="navigation-link">Prev</a>&nbsp;<a href="./tag-dispatching-protocol.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./apply-lambda-semantics.html" class="navigation-link">Back</a>&nbsp;<a href="./tag-dispatching-protocol.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./iterator-protocol.html" class="navigation-link">Iterator Protocol</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./iterator-protocol.html" class="navigation-link">Iterator Protocol</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="iterator-protocol">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id65" name="iterator-protocol">Iterator Protocol</a></h1>

doc/tutorial/miscellaneous.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./renaming-cleanup.html" class="navigation-link">Prev</a>&nbsp;<a href="./technical-details.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./renaming-cleanup.html" class="navigation-link">Back</a>&nbsp;Along</span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./miscellaneous.html" class="navigation-link">Miscellaneous</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./miscellaneous.html" class="navigation-link">Miscellaneous</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="miscellaneous">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id69" name="miscellaneous">Miscellaneous</a></h1>

doc/tutorial/numeric-metafunction.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./tag-dispatching-protocol.html" class="navigation-link">Prev</a>&nbsp;<a href="./renaming-cleanup.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tag-dispatching-protocol.html" class="navigation-link">Back</a>&nbsp;<a href="./renaming-cleanup.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./numeric-metafunction.html" class="navigation-link">Numeric Metafunction Protocol/Infrastructure</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./numeric-metafunction.html" class="navigation-link">Numeric Metafunction Protocol/Infrastructure</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="numeric-metafunction">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id67" name="numeric-metafunction">Numeric Metafunction Protocol/Infrastructure</a></h1>

doc/tutorial/renaming-cleanup.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./numeric-metafunction.html" class="navigation-link">Prev</a>&nbsp;<a href="./miscellaneous.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./numeric-metafunction.html" class="navigation-link">Back</a>&nbsp;<a href="./miscellaneous.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./renaming-cleanup.html" class="navigation-link">Renaming/Cleanup</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./renaming-cleanup.html" class="navigation-link">Renaming/Cleanup</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="renaming-cleanup">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id68" name="renaming-cleanup">Renaming/Cleanup</a></h1>

doc/tutorial/tag-dispatching-protocol.html

@@ -12,7 +12,7 @@
 </head>
 <body class="docframe">
 <table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./iterator-protocol.html" class="navigation-link">Prev</a>&nbsp;<a href="./numeric-metafunction.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./iterator-protocol.html" class="navigation-link">Back</a>&nbsp;<a href="./numeric-metafunction.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./changes-in-boost-1-32-0.html" class="navigation-link">Up</a>&nbsp;<a href="../index.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./tutorial_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog & History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./tag-dispatching-protocol.html" class="navigation-link">Tag Dispatching Protocol</a></td>
+<td class="header-group page-location"><a href="../index.html" class="navigation-link">Front Page</a> / <a href="./changelog-history.html" class="navigation-link">Changelog &amp; History</a> / <a href="./changes-in-boost-1-32-0.html" class="navigation-link">Changes in Boost 1.32.0 Release</a> / <a href="./tag-dispatching-protocol.html" class="navigation-link">Tag Dispatching Protocol</a></td>
 </tr></table><div class="header-separator"></div>
 <div class="section" id="tag-dispatching-protocol">
 <h1><a class="toc-backref" href="./changes-in-boost-1-32-0.html#id66" name="tag-dispatching-protocol">Tag Dispatching Protocol</a></h1>

include/boost/mpl/assert.hpp

@@ -39,7 +39,7 @@
 #include <boost/mpl/if.hpp>
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
     || (BOOST_MPL_CFG_GCC != 0) \
     || BOOST_WORKAROUND(__IBMCPP__, <= 600)
 #   define BOOST_MPL_CFG_ASSERT_USE_RELATION_NAMES
@@ -47,7 +47,7 @@
 
 #if BOOST_WORKAROUND(__MWERKS__, < 0x3202) \
     || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840))
 #   define BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER
 #endif
@@ -55,7 +55,7 @@
 // agurt, 10/nov/06: use enums for Borland (which cannot cope with static constants) 
 // and GCC (which issues "unused variable" warnings when static constants are used 
 // at a function scope)
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
     || (BOOST_MPL_CFG_GCC != 0) || (BOOST_MPL_CFG_GPU != 0) || defined(__PGI)
 #   define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) enum { expr }
 #else

include/boost/mpl/aux_/common_name_wknd.hpp

@@ -16,7 +16,7 @@
 
 #include <boost/mpl/aux_/config/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, < 0x561)
+#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x561)
 // agurt, 12/nov/02: to suppress the bogus "Cannot have both a template class 
 // and function named 'xxx'" diagnostic
 #   define BOOST_MPL_AUX_COMMON_NAME_WKND(name) \
@@ -29,6 +29,6 @@ template< typename > void name(); \
 
 #   define BOOST_MPL_AUX_COMMON_NAME_WKND(name) /**/
 
-#endif // __BORLANDC__
+#endif // BOOST_BORLANDC
 
 #endif // BOOST_MPL_AUX_COMMON_NAME_WKND_HPP_INCLUDED

include/boost/mpl/aux_/config/adl.hpp

@@ -27,7 +27,7 @@
 
 #if !defined(BOOST_MPL_CFG_NO_ADL_BARRIER_NAMESPACE) \
     && (   BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \
-        || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) \
         || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202)) \
         || BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, BOOST_TESTED_AT(810)) \

include/boost/mpl/aux_/config/arrays.hpp

@@ -19,7 +19,7 @@
 
 #if    !defined(BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && ( BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+    && ( BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
         )
 

include/boost/mpl/aux_/config/bcc.hpp

@@ -18,8 +18,8 @@
 
 #if    !defined(BOOST_MPL_CFG_BCC590_WORKAROUNDS) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, >= 0x590) \
-    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x590) \
+    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_BCC590_WORKAROUNDS
 

include/boost/mpl/aux_/config/bind.hpp

@@ -21,7 +21,7 @@
 #if    !defined(BOOST_MPL_CFG_NO_BIND_TEMPLATE) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
     && (   BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
-        || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         )
 
 #   define BOOST_MPL_CFG_NO_BIND_TEMPLATE

include/boost/mpl/aux_/config/compiler.hpp

@@ -32,10 +32,10 @@
 #   elif BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304))
 #       define BOOST_MPL_CFG_COMPILER_DIR gcc
 
-#   elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#   elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 #       if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 #           define BOOST_MPL_CFG_COMPILER_DIR bcc551
-#       elif BOOST_WORKAROUND(__BORLANDC__, >= 0x590)
+#       elif BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x590)
 #           define BOOST_MPL_CFG_COMPILER_DIR bcc
 #       else
 #           define BOOST_MPL_CFG_COMPILER_DIR bcc_pre590

include/boost/mpl/aux_/config/ctps.hpp

@@ -19,7 +19,7 @@
 
 #if    !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, < 0x582)
+    && BOOST_WORKAROUND(BOOST_BORLANDC, < 0x582)
 
 #   define BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC
 

include/boost/mpl/aux_/config/dtp.hpp

@@ -24,8 +24,8 @@
 
 #if    !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, >= 0x560) \
-    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x560) \
+    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES
 
@@ -35,7 +35,7 @@
 #if    !defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
     && (   BOOST_WORKAROUND(__MWERKS__, <= 0x3001) \
-        || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         || defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \
         )
         

include/boost/mpl/aux_/config/forwarding.hpp

@@ -18,7 +18,7 @@
 
 #if    !defined(BOOST_MPL_CFG_NO_NESTED_FORWARDING) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_NO_NESTED_FORWARDING
 

include/boost/mpl/aux_/config/integral.hpp

@@ -19,7 +19,7 @@
 
 #if    !defined(BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS
 

include/boost/mpl/aux_/config/operators.hpp

@@ -20,7 +20,7 @@
 
 #if !defined(BOOST_MPL_CFG_USE_OPERATORS_OVERLOADING) \
     && ( BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
-        || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         || BOOST_WORKAROUND(__EDG_VERSION__, <= 245) \
         || BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \
         || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \

include/boost/mpl/aux_/config/overload_resolution.hpp

@@ -18,7 +18,7 @@
 
 #if    !defined(BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && (   BOOST_WORKAROUND(__BORLANDC__, < 0x590) \
+    && (   BOOST_WORKAROUND(BOOST_BORLANDC, < 0x590) \
         || BOOST_WORKAROUND(__MWERKS__, < 0x3001) \
         )
 

include/boost/mpl/aux_/config/preprocessor.hpp

@@ -18,7 +18,7 @@
 
 #if !defined(BOOST_MPL_CFG_BROKEN_PP_MACRO_EXPANSION) \
     && (   BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \
-        || BOOST_WORKAROUND(__BORLANDC__, < 0x582) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, < 0x582) \
         || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \
         )
 

include/boost/mpl/aux_/config/ttp.hpp

@@ -20,7 +20,7 @@
 
 #if !defined(BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS) \
     && ( defined(BOOST_NO_TEMPLATE_TEMPLATES) \
-      || BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x590) ) \
+      || BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x590) ) \
        )
 
 #   define BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS
@@ -31,7 +31,7 @@
 #if    !defined(BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
     && (   BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0302)) \
-        || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
         )
 
 #   define BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING

include/boost/mpl/aux_/count_impl.hpp

@@ -26,7 +26,7 @@ namespace boost { namespace mpl {
 template< typename Tag > struct count_impl
 {
     template< typename Sequence, typename T > struct apply
-#if BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x561))
+#if BOOST_WORKAROUND(BOOST_BORLANDC,BOOST_TESTED_AT(0x561))
     {
         typedef typename count_if< Sequence,same_as<T> >::type type;
         BOOST_STATIC_CONSTANT(int, value = BOOST_MPL_AUX_VALUE_WKND(type)::value);

include/boost/mpl/aux_/fold_impl_body.hpp

@@ -60,7 +60,7 @@ struct AUX778076_FOLD_IMPL_NAME;
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 
-#   if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#   if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
 
 #   define BOOST_PP_ITERATION_PARAMS_1 \
     (3,(0, BOOST_MPL_LIMIT_UNROLLING, <boost/mpl/aux_/fold_impl_body.hpp>))
@@ -125,7 +125,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,Last,Last,State,ForwardOp>
     typedef Last iterator;
 };
 
-#   else // BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#   else // BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
 
 // Borland have some serious problems with the unrolled version, so
 // we always use a basic implementation
@@ -164,7 +164,7 @@ struct AUX778076_FOLD_IMPL_NAME<N,Last,Last,State,ForwardOp >
     typedef state type;
 };
 
-#   endif // BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#   endif // BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
  
 #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 

include/boost/mpl/aux_/has_rebind.hpp

@@ -25,7 +25,7 @@
 #   include <boost/mpl/if.hpp>
 #   include <boost/mpl/bool.hpp>
 #   include <boost/mpl/aux_/msvc_is_class.hpp>
-#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 #   include <boost/mpl/if.hpp>
 #   include <boost/mpl/bool.hpp>
 #   include <boost/mpl/aux_/yes_no.hpp>
@@ -62,7 +62,7 @@ struct has_rebind
 template< typename T > struct has_rebind_tag {};
 no_tag operator|(has_rebind_tag<int>, void const volatile*);
 
-#   if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#   if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 template< typename T >
 struct has_rebind
 {
@@ -71,7 +71,7 @@ struct has_rebind
           sizeof(has_rebind_tag<int>() | get()) == sizeof(yes_tag)
         );
 };
-#   else // __BORLANDC__
+#   else // BOOST_BORLANDC
 template< typename T >
 struct has_rebind_impl
 {
@@ -90,7 +90,7 @@ struct has_rebind
         >::type
 {
 };
-#   endif // __BORLANDC__
+#   endif // BOOST_BORLANDC
 
 #endif
 

include/boost/mpl/aux_/integral_wrapper.hpp

@@ -63,7 +63,7 @@ struct AUX_WRAPPER_NAME
  public:
     typedef AUX_WRAPPER_INST(next_value) next;
     typedef AUX_WRAPPER_INST(prior_value) prior;
-#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
+#elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
     || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \
     || (BOOST_WORKAROUND(__HP_aCC, <= 53800) && (BOOST_WORKAROUND(__hpxstd98, != 1)))
     typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)) ) next;

include/boost/mpl/aux_/lambda_support.hpp

@@ -110,7 +110,7 @@ template< typename T > struct has_rebind_tag;
     typedef BOOST_PP_CAT(name,_rebind) rebind; \
 /**/
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 #   define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) \
 template< BOOST_MPL_PP_PARAMS(i,typename T) > \
 ::boost::mpl::aux::yes_tag operator|( \
@@ -134,7 +134,7 @@ template< BOOST_MPL_PP_PARAMS(i,typename T) > \
 #   define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) /**/
 #endif
 
-#   if !defined(__BORLANDC__)
+#   if !defined(BOOST_BORLANDC)
 #   define BOOST_MPL_AUX_LAMBDA_SUPPORT(i, name, params) \
     BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(i, name, params) \
 }; \
@@ -160,7 +160,7 @@ class BOOST_PP_CAT(name,_rebind) \
         typedef typename name< BOOST_MPL_PP_PARAMS(i,U) >::type type; \
     }; \
 /**/
-#   endif // __BORLANDC__
+#   endif // BOOST_BORLANDC
 
 #endif // __EDG_VERSION__
 

include/boost/mpl/aux_/nested_type_wknd.hpp

@@ -18,7 +18,7 @@
 #include <boost/mpl/aux_/config/workaround.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0302)) \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
+    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
     || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530)) \
     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840))
 

include/boost/mpl/aux_/preprocessor/enum.hpp

@@ -29,6 +29,10 @@
     BOOST_PP_CAT(BOOST_MPL_PP_ENUM_,n)(param) \
     /**/
     
+#   define BOOST_MPL_PP_ENUM_Z(z_ignored, n, param) \
+    BOOST_PP_CAT(BOOST_MPL_PP_ENUM_,n)(param) \
+    /**/
+    
 #   define BOOST_MPL_PP_ENUM_0(p)
 #   define BOOST_MPL_PP_ENUM_1(p) p
 #   define BOOST_MPL_PP_ENUM_2(p) p,p
@@ -57,6 +61,14 @@
         ) \
     /**/
 
+#   define BOOST_MPL_PP_ENUM_Z(z, n, param) \
+    BOOST_PP_REPEAT_ ## z( \
+          n \
+        , BOOST_MPL_PP_AUX_ENUM_FUNC \
+        , param \
+        ) \
+    /**/
+
 #endif
 
 #endif // BOOST_MPL_AUX_PREPROCESSOR_ENUM_HPP_INCLUDED

include/boost/mpl/aux_/preprocessor/params.hpp

@@ -29,6 +29,10 @@
     BOOST_PP_CAT(BOOST_MPL_PP_PARAMS_,n)(p) \
     /**/
 
+#   define BOOST_MPL_PP_PARAMS_Z(z_ignored,n,p) \
+    BOOST_PP_CAT(BOOST_MPL_PP_PARAMS_,n)(p) \
+    /**/
+
 #   define BOOST_MPL_PP_PARAMS_0(p)
 #   define BOOST_MPL_PP_PARAMS_1(p) p##1
 #   define BOOST_MPL_PP_PARAMS_2(p) p##1,p##2
@@ -60,6 +64,14 @@
         ) \
     /**/
 
+#   define BOOST_MPL_PP_PARAMS_Z(z, n, param) \
+    BOOST_PP_REPEAT_ ## z( \
+          n \
+        , BOOST_MPL_PP_AUX_PARAM_FUNC \
+        , param \
+        ) \
+    /**/
+
 #endif 
 
 #endif // BOOST_MPL_AUX_PREPROCESSOR_PARAMS_HPP_INCLUDED

include/boost/mpl/aux_/size_impl.hpp

@@ -29,7 +29,7 @@ template< typename Tag >
 struct size_impl
 {
     template< typename Sequence > struct apply
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561))
         : distance<
               typename begin<Sequence>::type
             , typename end<Sequence>::type

include/boost/mpl/aux_/static_cast.hpp

@@ -16,7 +16,7 @@
 
 #include <boost/mpl/aux_/config/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
  || BOOST_WORKAROUND(__GNUC__, < 3) \
  || BOOST_WORKAROUND(__MWERKS__, <= 0x3001)
 #   define BOOST_MPL_AUX_STATIC_CAST(T, expr) (T)(expr)

include/boost/mpl/has_xxx.hpp

@@ -33,7 +33,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_trailing_params.hpp>
 
-#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) )
+#if BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) )
 # include <boost/type_traits/is_class.hpp>
 #endif
 
@@ -196,7 +196,7 @@ struct trait \
 }; \
 /**/
 
-#   elif BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) )
+#   elif BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) )
 
 #   define BOOST_MPL_HAS_XXX_TRAIT_NAMED_BCB_DEF(trait, trait_tester, name, default_) \
 template< typename T, bool IS_CLASS > \
@@ -334,7 +334,7 @@ struct trait \
 // correct name but different number of arguments.
 #   define BOOST_MPL_HAS_MEMBER_MULTI_SUBSTITUTE(z, n, args) \
       template< \
-          template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename V) > class V \
+          template< BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), typename V) > class V \
        > \
       struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME(args, n) { \
       }; \
@@ -503,7 +503,7 @@ struct trait \
                  z, n, args \
              ) \
         template< \
-             template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename U) > class U \
+             template< BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), typename U) > class U \
         > \
         struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME_WITH_TEMPLATE_SFINAE( \
                 args, n \

include/boost/mpl/integral_c.hpp

@@ -33,7 +33,7 @@
 
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
- && !BOOST_WORKAROUND(__BORLANDC__, <= 0x551)
+ && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551)
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 // 'bool' constant doesn't have 'next'/'prior' members
 template< bool C >

include/boost/mpl/lower_bound.hpp

@@ -19,7 +19,7 @@
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 #   define BOOST_MPL_CFG_STRIPPED_DOWN_LOWER_BOUND_IMPL
 #endif
 

include/boost/mpl/numeric_cast.hpp

@@ -21,7 +21,7 @@
 // resolves conflicts with 'boost::numeric_cast' function template.
 // use it in your own code _only_ if you care about compatibility with
 // these outdated compilers!
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570) )
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570) )
 #   define BOOST_MPL_AUX_NUMERIC_CAST numeric_cast_
 #else
 #   define BOOST_MPL_AUX_NUMERIC_CAST numeric_cast

include/boost/mpl/string.hpp

@@ -500,11 +500,11 @@ namespace boost { namespace mpl
     };
 
     #define M0(z, n, data)                                                                            \
-    template<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, int C), int J>                         \
-    struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)>, n, J>   \
+    template<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, int C), int J>                    \
+    struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)>, n, J> \
     {                                                                                                 \
         enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == J + 1) };                   \
-        typedef mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> string;             \
+        typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string;        \
         typedef std::bidirectional_iterator_tag category;                                             \
         typedef                                                                                       \
             mpl::string_iterator<string, n + eomc_, eomc_ ? 0 : J + 1>                                \
@@ -514,11 +514,11 @@ namespace boost { namespace mpl
         prior;                                                                                        \
         typedef mpl::char_<BOOST_MPL_MULTICHAR_AT(BOOST_PP_CAT(C, n), J)> type;                       \
     };                                                                                                \
-    template<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, int C)>                                \
-    struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)>, n, 0>   \
+    template<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, int C)>                           \
+    struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)>, n, 0> \
     {                                                                                                 \
         enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == 1) };                       \
-        typedef mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> string;             \
+        typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string;        \
         typedef std::bidirectional_iterator_tag category;                                             \
         typedef                                                                                       \
             mpl::string_iterator<string, n + eomc_, !eomc_>                                           \

include/boost/mpl/upper_bound.hpp

@@ -19,7 +19,7 @@
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
 #   define BOOST_MPL_CFG_STRIPPED_DOWN_UPPER_BOUND_IMPL
 #endif
 

include/boost/mpl/vector/aux_/at.hpp

@@ -65,7 +65,7 @@ template< BOOST_MPL_AUX_NTTP_DECL(long, n_) >
 struct at_impl< aux::vector_tag<n_> >
 {
     template< typename Vector, typename N > struct apply
-#if !defined(__BORLANDC__)
+#if !defined(BOOST_BORLANDC)
         : v_at<
               Vector
             , BOOST_MPL_AUX_VALUE_WKND(N)::value

meta/libraries.json

@@ -10,5 +10,6 @@
     ],
     "maintainers": [
         "Aleksey Gurtovoy <agurtovoy -at- meta-comm.com>"
-    ]
+    ],
+    "cxxstd": "03"
 }

test/apply_wrap.cpp

@@ -24,14 +24,14 @@
 #include <boost/preprocessor/cat.hpp>
 
 #if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
-#   define APPLY_0_FUNC_DEF(i) \
+#   define APPLY_0_FUNC_DEF(z_ignored,i) \
     struct f0 \
     { \
         template< typename T = int > struct apply { typedef char type; }; \
     }; \
 /**/
 #else
-#   define APPLY_0_FUNC_DEF(i) \
+#   define APPLY_0_FUNC_DEF(z_ignored,i) \
     struct f0 \
     { \
         template< typename T > struct apply { typedef char type; }; \
@@ -39,16 +39,16 @@
 /**/
 #endif
 
-#define APPLY_N_FUNC_DEF(i) \
+#define APPLY_N_FUNC_DEF(z,i) \
     struct first##i \
     { \
-        template< BOOST_MPL_PP_PARAMS(i, typename U) > \
+        template< BOOST_MPL_PP_PARAMS_Z(z, i, typename U) > \
         struct apply { typedef U1 type; }; \
     }; \
     \
     struct last##i \
     { \
-        template< BOOST_MPL_PP_PARAMS(i, typename U) > \
+        template< BOOST_MPL_PP_PARAMS_Z(z, i, typename U) > \
         struct apply { typedef BOOST_PP_CAT(U,i) type; }; \
     }; \
 /**/
@@ -58,7 +58,7 @@
           i \
         , APPLY_N_FUNC_DEF \
         , APPLY_0_FUNC_DEF \
-        )(i) \
+        )(z,i) \
 /**/
 
 namespace { namespace test {
@@ -73,22 +73,22 @@ struct g0 { struct apply { typedef char type; }; };
 
 }}
 
-#define APPLY_0_TEST(i, apply_) \
+#define APPLY_0_TEST(z_ignored, i, apply_) \
     typedef apply_<test::f##i>::type t; \
     { MPL_ASSERT(( boost::is_same<t, char> )); } \
 /**/
 
-#define APPLY_N_TEST(i, apply_) \
+#define APPLY_N_TEST(z, i, apply_) \
     typedef apply_< \
           test::first##i \
         , char \
         BOOST_PP_COMMA_IF(BOOST_PP_DEC(i)) \
-        BOOST_MPL_PP_ENUM(BOOST_PP_DEC(i), int) \
+        BOOST_MPL_PP_ENUM_Z(z, BOOST_PP_DEC(i), int) \
         >::type t1##i; \
     \
     typedef apply_< \
           test::last##i \
-        , BOOST_MPL_PP_ENUM(BOOST_PP_DEC(i), int) \
+        , BOOST_MPL_PP_ENUM_Z(z, BOOST_PP_DEC(i), int) \
         BOOST_PP_COMMA_IF(BOOST_PP_DEC(i)) char \
         >::type t2##i; \
     { MPL_ASSERT(( boost::is_same<t1##i, char> )); } \
@@ -100,7 +100,7 @@ struct g0 { struct apply { typedef char type; }; };
           i \
         , APPLY_N_TEST \
         , APPLY_0_TEST \
-        )(i, BOOST_PP_CAT(apply_wrap,i)) \
+        )(z, i, BOOST_PP_CAT(apply_wrap,i)) \
 /**/
 
 

test/aux_/increased_arity.cpp

@@ -25,11 +25,11 @@
 #include <boost/preprocessor/enum_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
-#define TEST_N_ARY(unused1, N, unused2) \
+#define TEST_N_ARY(z, N, unused2) \
     static_assert_< \
         apply< \
-            and_<BOOST_PP_ENUM_PARAMS(N, _ BOOST_PP_INTERCEPT)>, \
-            BOOST_PP_ENUM_PARAMS(N, true_ BOOST_PP_INTERCEPT) \
+            and_<BOOST_PP_ENUM_PARAMS_Z(z, N, _ BOOST_PP_INTERCEPT)>, \
+            BOOST_PP_ENUM_PARAMS_Z(z, N, true_ BOOST_PP_INTERCEPT) \
         > \
     >(); \
 /**/

test/integral_wrapper_test.hpp

@@ -17,7 +17,7 @@
 
 #include <cassert>
 
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
 #   define INTEGRAL_WRAPPER_RUNTIME_TEST(i, T) \
     BOOST_TEST(( WRAPPER(T,i)() == i )); \
     BOOST_TEST(( WRAPPER(T,i)::value == i )); \
@@ -34,7 +34,7 @@
 #define CONSTEXPR_INTEGRAL_TEST(T, i) { static_assert(T() == i, "Constexpr for integral constant failed"); }
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x582))
 // agurt 20/nov/06: see http://article.gmane.org/gmane.comp.lib.boost.devel/151065
 #define INTEGRAL_WRAPPER_TEST(unused1, i, T) \
     { \

test/lambda_args.cpp

@@ -38,7 +38,7 @@ MPL_TEST_CASE()
     AUX_LAMBDA_TEST( int& );
     AUX_LAMBDA_TEST( int* );
 #if !BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \
-    && !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+    && !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600)
     AUX_LAMBDA_TEST( int[] );
 #endif
     AUX_LAMBDA_TEST( int[10] );