Release 1.48.0

[SVN r75495]

.travis.yml

@@ -1,175 +0,0 @@
-# Copyright 2016 Peter Dimov
-# Copyright 2017, 2018 James E. King III
-# 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)
-
-#
-# Generic Travis CI build script for boostorg repositories
-# See: https://github.com/jeking3/boost-ci
-#
-# Instructions for customizing this script for your library:
-# 
-# 1. Customize the compilers and language levels you want in the 'jobs'.
-# 2. If you have more than include/, src/, test/, example/, examples/, or
-#    tools/ directories, modify your Travis CI project and add the environment
-#    variable DEPINST.  For example if your build uses code in "bench/" and
-#    "fog/" directories, then set DEPINST to the following:
-#        --include bench --include fog
-# 3. If you want to enable Coverity Scan, you need to provide the environment
-#    variables COVERITY_SCAN_TOKEN and COVERITY_SCAN_NOTIFICATION_EMAIL in
-#    your github settings.
-# 4. Enable pull request builds in your boostorg/<library> account.
-#
-# That's it - the scripts will do everything else for you.
-
-sudo: false
-dist: trusty
-language: cpp
-
-env:
-  global:
-  # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-  # to use the default for a given environment, comment it out; recommend you build debug and release however..
-  # - B2_ADDRESS_MODEL=address-model=64,32
-  # - B2_LINK=link=shared,static
-  # - B2_THREADING=threading=multi,single
-    - B2_VARIANT=variant=release,debug
-
-install:
-  - git clone https://github.com/jeking3/boost-ci.git boost-ci
-  - cp -pr boost-ci/ci boost-ci/.codecov.yml .
-  - source ci/travis/install.sh
-
-addons:
-  apt:
-    packages:
-      - binutils-gold
-      - gdb
-      - libc6-dbg
-        
-branches:
-  only:
-    - develop
-    - master
-    
-script:
-  - cd $BOOST_ROOT/libs/$SELF
-  - ci/travis/build.sh
-
-#
-# Default toolsets in Ubuntu
-#
-#       trusty xenial bionic
-#        14.04  16.04  18.04
-#       ------ ------ ------
-# clang    3.4    3.8    6.0
-#   gcc  4.8.2  5.3.1  7.3.0
-#
-
-anchors:
-  clang-34: &clang-34 { apt: { packages: [ "clang-3.4"       ], sources: [ "llvm-toolchain-trusty-3.4" ] } }
-  clang-38: &clang-38 { apt: { packages: [ "clang-3.8",
-                                           "libstdc++-6-dev" ], sources: [ "llvm-toolchain-trusty-3.8",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-4:  &clang-4  { apt: { packages: [ "clang-4.0",
-                                           "libstdc++-6-dev" ], sources: [ "llvm-toolchain-trusty-4.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-5:  &clang-5  { apt: { packages: [ "clang-5.0",
-                                           "libstdc++-7-dev" ], sources: [ "llvm-toolchain-trusty-5.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-6:  &clang-6  { apt: { packages: [ "clang-6.0",
-                                           "libc++-dev",
-                                           "libstdc++-8-dev",
-                                           "valgrind"        ], sources: [ "llvm-toolchain-trusty-6.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  gcc-44:   &gcc-44   { apt: { packages: [ "g++-4.4"         ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-46:   &gcc-46   { apt: { packages: [ "g++-4.6"         ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-48:   &gcc-48   { apt: { packages: [ "g++-4.8"         ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-5:    &gcc-5    { apt: { packages: [ "g++-5"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-6:    &gcc-6    { apt: { packages: [ "g++-6"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-7:    &gcc-7    { apt: { packages: [ "g++-7"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-8:    &gcc-8    { apt: { packages: [ "g++-8"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-
-jobs:
-  allow_failures:
-    - env:
-      - COPY="all the environment settings from your job"
-
-  include:
-    # libstdc++
-    - { os: "linux", env: [ "TOOLSET=gcc-4.4",   "CXXSTD=98,0x"          ], addons: *gcc-44    }
-    - { os: "linux", env: [ "TOOLSET=gcc-4.6",   "CXXSTD=03,0x"          ], addons: *gcc-46    }
-    - { os: "linux", env: [ "TOOLSET=gcc-4.8",   "CXXSTD=03,11"          ], addons: *gcc-48    }
-    - { os: "linux", env: [ "TOOLSET=gcc-5",     "CXXSTD=03,11"          ], addons: *gcc-5     }
-    - { os: "linux", env: [ "TOOLSET=gcc-6",     "CXXSTD=03,11,14"       ], addons: *gcc-6     }
-    - { os: "linux", env: [ "TOOLSET=gcc-7",     "CXXSTD=03,11,14,17"    ], addons: *gcc-7     }
-    - { os: "linux", env: [ "TOOLSET=gcc-8",     "CXXSTD=03,11,14,17,2a" ], addons: *gcc-8     }
-    - { os: "linux", env: [ "TOOLSET=clang-3.4", "CXXSTD=03,11"          ], addons: *clang-34  }
-    - { os: "linux", env: [ "TOOLSET=clang-3.8", "CXXSTD=03,11,14"       ], addons: *clang-38  }
-    - { os: "linux", env: [ "TOOLSET=clang-4.0", "CXXSTD=03,11,14"       ], addons: *clang-4   }
-    - { os: "linux", env: [ "TOOLSET=clang-5.0", "CXXSTD=03,11,14,17"    ], addons: *clang-5   }
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03,11,14,17,2a" ], addons: *clang-6   }
-    # libc++
-    - { os: "linux", env: [ "TOOLSET=clang-6.0", "CXXSTD=03,11,14,17,2a",
-                            "CXXFLAGS=-stdlib=libc++"                    ], addons: *clang-6   }
-  # the rvm environment on osx is taking over basic commands like "cd" and breaking things!
-  # - { os: "osx"  , env: [ "COMMENT=libc++",
-  #                         "TOOLSET=clang",     "CXXSTD=03,11,14"       ]                     }
-
-    - os: linux
-      env: 
-        - COMMENT=codecov.io
-        - TOOLSET=gcc-7
-        - DEFINES="define=BOOST_NO_STRESS_TEST=1"
-      addons: *gcc-7
-      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
-
-    - os: linux
-      env:
-        - COMMENT=cppcheck
-      script:
-        - cd $BOOST_ROOT/libs/$SELF
-        - ci/travis/cppcheck.sh
-
-    - os: linux
-      env:
-        - 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
-      addons: *gcc-8
-
-    - os: linux
-      env:
-        - 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
-      addons: *clang-6
-
-    #################### Jobs to run on pushes to master, develop ###################
-
-    # Coverity Scan
-    - os: linux
-      if: (env(COVERITY_SCAN_NOTIFICATION_EMAIL) IS present) AND (branch IN (develop, master)) AND (type IN (cron, push))
-      env:
-        - COMMENT="Coverity Scan"
-        - TOOLSET=gcc-7
-      addons: *gcc-7
-      script:
-        - cd $BOOST_ROOT/libs/$SELF
-        - ci/travis/coverity.sh
-
-notifications:
-  email:
-    false

CMakeLists.txt

@@ -1,26 +0,0 @@
-# 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 )
-
-add_library( boost_mpl INTERFACE )
-add_library( Boost::mpl ALIAS boost_mpl )
-
-target_include_directories( boost_mpl INTERFACE include )
-
-target_link_libraries( boost_mpl
-    INTERFACE
-        Boost::config
-        Boost::core
-        Boost::predef
-        Boost::preprocessor
-        Boost::static_assert
-        Boost::type_traits
-        Boost::utility
-)
-

Jamfile

@@ -1,11 +0,0 @@
-#  Boost.MPL Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  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)
-
-# please order by name to ease maintenance
-build-project example ;
-build-project test ;

LICENSE

@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

README.md

@@ -1,34 +0,0 @@
-MPL, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), provides a general-purpose, high-level C++ template metaprogramming framework of compile-time algorithms, sequences and metafunctions.
-
-### License
-
-Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
-
-### Properties
-
-* C++03
-* Header Only
-
-### Build Status
-
-Branch          | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
-:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
-[`master`](https://github.com/boostorg/mpl/tree/master) | [![Build Status](https://travis-ci.org/boostorg/mpl.svg?branch=master)](https://travis-ci.org/boostorg/mpl) | [![Build status](https://ci.appveyor.com/api/projects/status/lx9pjj2ixqod6flb/branch/master?svg=true)](https://ci.appveyor.com/project/jeking3/mpl-nrhfm/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15866/badge.svg)](https://scan.coverity.com/projects/boostorg-mpl) | [![codecov](https://codecov.io/gh/boostorg/mpl/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/mpl/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/mpl.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/mpl.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/mpl.html)
-[`develop`](https://github.com/boostorg/mpl/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/mpl.svg?branch=develop)](https://travis-ci.org/boostorg/mpl) | [![Build status](https://ci.appveyor.com/api/projects/status/lx9pjj2ixqod6flb/branch/develop?svg=true)](https://ci.appveyor.com/project/jeking3/mpl-nrhfm/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/15866/badge.svg)](https://scan.coverity.com/projects/boostorg-mpl) | [![codecov](https://codecov.io/gh/boostorg/mpl/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/mpl/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/mpl.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/mpl.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/mpl.html)
-
-### Directories
-
-| Name        | Purpose                        |
-| ----------- | ------------------------------ |
-| `doc`       | documentation                  |
-| `example`   | examples                       |
-| `include`   | headers                        |
-| `test`      | unit tests                     |
-
-### More information
-
-* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-mpl)
-* [Report bugs](https://github.com/boostorg/mpl/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
-* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
-* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[mpl]` tag at the beginning of the subject line.
-

appveyor.yml

@@ -1,150 +0,0 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright (C) 2017, 2018 James E. King III
-# 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)
-
-#
-# Generic Appveyor build script for boostorg repositories
-# See: https://github.com/jeking3/boost-ci/
-#
-# Instructions for customizing this script for your library:
-#
-# 1. Customize the compilers and language levels you want.
-# 2. If you have move than include/, src/, test/, example/, examples/,
-#    benchmark/ or tools/ directories, set the environment variable DEPINST.
-#    For example if your build uses code in "bench/" and "fog/" directories:
-#      - DEPINST: --include bench --include fog
-# 3. Enable pull request builds in your boostorg/<library> account.
-#
-# That's it - the script will do everything else for you.
-#
-
-version: 1.0.{build}-{branch}
-
-shallow_clone: true
-
-branches:
-  only:
-    - develop
-    - master
-
-matrix:
-  # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
-  allow_failures:
-    - MAYFAIL: true
-
-environment:
-  global:
-    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-    # to use the default for a given environment, comment it out; recommend you build debug and release however:
-    # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
-    # libraries that care about this exercise it in their Jamfiles...
-    # B2_ADDRESS_MODEL: address-model=64,32
-    # B2_LINK: link=shared,static
-    # B2_THREADING: threading=multi,single
-    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
-      B2_ADDRESS_MODEL: address-model=64
-      CXXFLAGS: cxxflags=-permissive-
-      CXXSTD: latest # 2a
-
-    - FLAVOR: Visual Studio 2017 C++17
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      B2_ADDRESS_MODEL: address-model=64
-      CXXSTD: 17
-
-    - FLAVOR: Visual Studio 2017 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
-      B2_ADDRESS_MODEL: address-model=64,32
-
-    - 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 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
-      ADDPATH: C:\cygwin\bin;
-      B2_ADDRESS_MODEL: address-model=32
-      CXXSTD: 03,11
-      # https://github.com/boostorg/test/issues/144
-      DEFINES: define=_POSIX_C_SOURCE=200112L
-      THREADING: threadapi=pthread
-      TOOLSET: gcc
-
-    - FLAVOR: cygwin (64-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: address-model=64
-      CXXSTD: 11,17
-      # https://github.com/boostorg/test/issues/144
-      DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99
-      THREADING: threadapi=pthread
-      TOOLSET: gcc
-
-    - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: i686
-      B2_ADDRESS_MODEL: address-model=32
-      CXXSTD: 03,11
-      SCRIPT: ci\appveyor\mingw.bat
-
-    - FLAVOR: mingw64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: x86_64
-      B2_ADDRESS_MODEL: address-model=64
-      CXXSTD: 11,17
-      B2_DEFINES: define=__USE_ISOC99
-      SCRIPT: ci\appveyor\mingw.bat
-
-install:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - git clone https://github.com/jeking3/boost-ci.git C:\boost-ci
-  - xcopy /s /e /q /i C:\boost-ci\ci .\ci
-  - ci\appveyor\install.bat
-
-build: off
-
-test_script:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - PATH=%ADDPATH%%PATH%
-  # The definition of TOOLCXX omits CXXSTD= if it was not defined above
-  - IF NOT DEFINED CXXSTD (SET TOOLCXX=toolset=%TOOLSET%) ELSE (SET TOOLCXX=toolset=%TOOLSET% cxxstd=%CXXSTD%)
-  # Echo the complete build command to the build log
-  - IF NOT DEFINED SCRIPT                         (ECHO b2 libs/%SELF:\=/% %TOOLCXX% %CXXFLAGS% %DEFINES% %THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
-  # Now go build...
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %TOOLCXX% %CXXFLAGS% %DEFINES% %THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)

doc/index.html

@@ -35,7 +35,7 @@ metafunctions. It provides a conceptual foundation and an extensive
 set of powerful and coherent tools that make doing explict metaprogramming 
 in C++ as easy and enjoyable as possible within the current language.</p>
 <p>There are several places to start when getting familiar with the library,
-depending on what you know about metaprogramming in general and
+depending on what your know about metaprogramming in general and 
 C++ template metaprogramming in particular.  Starting with
 Boost version 1.32, the MPL comes with both an <a class="reference" href="./tutorial/tutorial-metafunctions.html">in-depth tutorial</a> on its 
 fundamental concepts and an annotated <a class="reference" href="./tutorial/reference-manual.html">reference manual</a> covering all concepts 

doc/refmanual/acknowledgements.html

@@ -14,7 +14,7 @@
 <div class="section" id="acknowledgements">
 <h1><a class="toc-backref" href="../refmanual.html#id1614">Acknowledgements</a></h1>
 <p id="label-acknowledgements">The format and language of this reference documentation has been greatly influenced by
-the SGI's <a class="reference external" href="https://boost.org/sgi/stl/" target="_top">Standard Template Library Programmer's Guide</a>.</p>
+the SGI's <a class="reference external" href="http://www.sgi.com/tech/stl/" target="_top">Standard Template Library Programmer's Guide</a>.</p>
 </div>
 
 <div class="footer-separator"></div>

doc/refmanual/algorithms.html

@@ -38,7 +38,7 @@ implementations by operating on <a class="reference internal" href="./iterators.
 major categories: iteration algorithms, querying algorithms, and
 transformation algorithms. The transformation algorithms introduce
 an associated <a class="reference internal" href="./inserter.html">Inserter</a> concept, a rough equivalent for the notion of
-<a class="reference external" href="https://boost.org/sgi/stl/OutputIterator.html" target="_top">Output Iterator</a> in the Standard Library. Moreover, every
+<a class="reference external" href="http://www.sgi.com/tech/stl/OutputIterator.html" target="_top">Output Iterator</a> in the Standard Library. Moreover, every
 transformation algorithm provides a <tt class="literal"><span class="pre">reverse_</span></tt> counterpart,
 allowing for a wider range of efficient transformations — a
 common functionality documented by the <a class="reference internal" href="./reversible-algorithm.html">Reversible Algorithm</a>

doc/refmanual/for-each.html

@@ -71,7 +71,7 @@ every element in the [<tt class="literal"><span class="pre"><a href="./begin.htm
 <td>A transformation.</td>
 </tr>
 <tr><td><tt class="literal"><span class="pre">f</span></tt></td>
-<td>An <a class="reference external" href="https://boost.org/sgi/stl/UnaryFunction.html" target="_top">unary function object</a></td>
+<td>An <a class="reference external" href="http://www.sgi.com/tech/stl/UnaryFunction.html" target="_top">unary function object</a></td>
 <td>A runtime operation to apply.</td>
 </tr>
 </tbody>
@@ -80,7 +80,7 @@ every element in the [<tt class="literal"><span class="pre"><a href="./begin.htm
 <div class="section" id="id816">
 <h3><a class="subsection-title" href="#expression-semantics" name="expression-semantics">Expression semantics</a></h3>
 <p>For any <a class="reference internal" href="./forward-sequence.html">Forward Sequence</a> <tt class="literal"><span class="pre">s</span></tt>, <a class="reference internal" href="./lambda-expression.html">Lambda Expression</a> <tt class="literal"><span class="pre">op</span></tt> , and an
-<a class="reference external" href="https://boost.org/sgi/stl/UnaryFunction.html" target="_top">unary function object</a> <tt class="literal"><span class="pre">f</span></tt>:</p>
+<a class="reference external" href="http://www.sgi.com/tech/stl/UnaryFunction.html" target="_top">unary function object</a> <tt class="literal"><span class="pre">f</span></tt>:</p>
 <pre class="literal-block">
 <a href="./for-each.html" class="identifier">for_each</a>&lt;s&gt;( f );
 </pre>
@@ -123,7 +123,7 @@ typedef <a href="./next.html" class="identifier">next</a>&lt;i<sub>n</sub>&gt;::
 </tr>
 <tr class="field"><th class="field-name">Postcondition:</th><td class="field-body"><p class="first">Equivalent to</p>
 <pre class="last literal-block">
-<a href="./for-each.html" class="identifier">for_each</a>&lt; <a href="./transform-view.html" class="identifier">transform_view</a>&lt;s,op&gt; &gt;( f );
+<a href="./for-each.html" class="identifier">for_each</a>&lt; tranform_view&lt;s,op&gt; &gt;( f );
 </pre>
 </td>
 </tr>
@@ -141,7 +141,7 @@ struct value_printer
 {
     template&lt; typename U &gt; void operator()(U x)
     {
-        std::cout &lt;&lt; x &lt;&lt; '\n';
+        std::cout &lt;&lt; x &lt;&lt; 'n';
     }
 };
 

doc/refmanual/get-tag-def.html

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
-<title>The MPL Reference Manual: BOOST_MPL_GET_TAG_DEF</title>
-<link rel="stylesheet" href="../style.css" type="text/css" />
-</head>
-<body class="docframe refmanual">
-<table class="header"><tr class="header"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Prev</a>&nbsp;<a href="./has-xxx-trait-named-def.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Back</a>&nbsp;<a href="./get-tag-def.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Up</a>&nbsp;<a href="../refmanual.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./refmanual_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td class="header-group page-location"><a href="../refmanual.html" class="navigation-link">Front Page</a> / <a href="./macros.html" class="navigation-link">Macros</a> / <a href="./introspection.html" class="navigation-link">Introspection</a> / <a href="./has-xxx-trait-def.html" class="navigation-link">BOOST_MPL_GET_TAG_DEF</a></td>
-</tr></table><div class="header-separator"></div>
-<div class="section" id="boost-mpl-has-xxx-trait-def">
-<h1><a class="toc-backref" href="./introspection.html#id1595">BOOST_MPL_GET_TAG_DEF</a></h1>
-<div class="section" id="id1329">
-<h3><a class="subsection-title" href="#synopsis" name="synopsis">Synopsis</a></h3>
-<pre class="literal-block">
-#define <a href="./has-xxx-trait-def.html" class="identifier">BOOST_MPL_GET_TAG_DEF</a>(name) \
-    <em>unspecified token sequence</em> \
-/**/
-</pre>
-</div>
-<div class="section" id="id1330">
-<h3><a class="subsection-title" href="#description" name="description">Description</a></h3>
-<p>Expands into a definition of a lazy getter <a class="reference internal" href="./metafunction.html">Metafunction</a> <tt class="literal"><span class="pre">get_tag_name</span></tt>
-such that for any type <tt class="literal"><span class="pre">x</span></tt> <tt class="literal"><span class="pre">get_tag_name&lt;x&gt;::type</span> <span class="pre">is</span> <span class="pre">type</span></tt> where
- <tt class="literal"><span class="pre">name</span></tt> is a nested type member of <tt class="literal"><span class="pre">x</span></tt>.</p>
-</div>
-<div class="section" id="id1331">
-<h3><a class="subsection-title" href="#header" name="header">Header</a></h3>
-<pre class="literal-block">
-#include &lt;<a href="../../../../boost/mpl/get_tag.hpp" class="header">boost/mpl/get_tag.hpp</a>&gt;
-</pre>
-</div>
-<div class="section" id="id1332">
-<h3><a class="subsection-title" href="#parameters" name="parameters">Parameters</a></h3>
-<table border="1" class="docutils table">
-<colgroup>
-<col width="15%" />
-<col width="32%" />
-<col width="53%" />
-</colgroup>
-<thead valign="bottom">
-<tr><th class="head">Parameter</th>
-<th class="head">Requirement</th>
-<th class="head">Description</th>
-</tr>
-</thead>
-<tbody valign="top">
-<tr><td><tt class="literal"><span class="pre">name</span></tt></td>
-<td>A legal identifier token</td>
-<td>A name of the member to get.</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="section" id="id1333">
-<h3><a class="subsection-title" href="#expression-semantics" name="expression-semantics">Expression semantics</a></h3>
-<p>For any legal C++ identifier <tt class="literal"><span class="pre">name</span></tt>:</p>
-<pre class="literal-block">
-<a href="./has-xxx-trait-def.html" class="identifier">BOOST_MPL_GET_TAG_DEF</a>(name)
-</pre>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name">Precondition:</th><td class="field-body"><p class="first">Appears at namespace scope.</p>
-</td>
-</tr>
-<tr class="field"><th class="field-name">Return type:</th><td class="field-body"><p class="first">None.</p>
-</td>
-</tr>
-<tr class="field"><th class="field-name">Semantics:</th><td class="field-body"><p class="first">Equivalent to</p>
-<pre class="last literal-block">
-namespace boost { namespace mpl {</pre>
-    <pre class="last literal-block">
-template&lt;class T&gt;
-struct get_##name {
-	typedef typename T::name type;
-};</pre>
-    <pre class="last literal-block">
-}}
-</pre>
-</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="section" id="id1334">
-<h3><a class="subsection-title" href="#example" name="example">Example</a></h3>
-<pre class="literal-block">
-struct test_type_get_tag_def;
-
-<a href="get-tag-def.html" class="identifier">BOOST_MPL_GET_TAG_DEF</a>(a_tag);
-
-namespace boost { namespace mpl {
-
-struct test_type_get_tag_def
-{
-	typedef int a_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>
-<!-- Macros/Introspection/BOOST_MPL_GET_TAG_DEF -->
-</div>
-</div>
-
-<div class="footer-separator"></div>
-<table class="footer"><tr class="footer"><td class="header-group navigation-bar"><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Prev</a>&nbsp;<a href="./has-xxx-template-named-def.html" class="navigation-link">Next</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Back</a>&nbsp;<a href="./get-tag-def.html" class="navigation-link">Along</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./introspection.html" class="navigation-link">Up</a>&nbsp;<a href="../refmanual.html" class="navigation-link">Home</a></span><span class="navigation-group-separator">&nbsp;|&nbsp;</span><span class="navigation-group"><a href="./refmanual_toc.html" class="navigation-link">Full TOC</a></span></td>
-<td><div class="copyright-footer"><div class="copyright">Copyright ©  2017 Sergey Krivonos and Edward Diener</div>
-Distributed under the Boost Software License, Version 1.0. (See accompanying
-file LICENSE_1_0.txt or copy at <a class="reference external" href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)</div></td></tr></table></body>
-</html>

doc/refmanual/inserter.html

@@ -15,7 +15,7 @@
 <h1><a class="toc-backref" href="./algorithms-concepts.html#id1462">Inserter</a></h1>
 <div class="section" id="id454">
 <h3><a class="subsection-title" href="#description" name="description">Description</a></h3>
-<p>An <a class="reference internal" href="./inserter.html">Inserter</a> is a compile-time substitute for STL <a class="reference external" href="https://boost.org/sgi/stl/OutputIterator.html" target="_top">Output Iterator</a>.
+<p>An <a class="reference internal" href="./inserter.html">Inserter</a> is a compile-time substitute for STL <a class="reference external" href="http://www.sgi.com/tech/stl/OutputIterator.html" target="_top">Output Iterator</a>.
 Under the hood, it's simply a type holding
 two entities: a <em>state</em> and an <em>operation</em>. When passed to a
 <a class="reference internal" href="./transformation-algorithms.html">transformation algorithm</a>, the inserter's binary operation is

doc/refmanual/introspection.html

@@ -19,7 +19,6 @@
 <!-- Software License, Version 1.0. (See accompanying -->
 <!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
 <ul class="toc simple" id="outline">
-<li><a class="reference internal" href="./get-tag-def.html" id="id1615">BOOST_MPL_GET_TAG_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-template-def.html" id="id1593">BOOST_MPL_HAS_XXX_TEMPLATE_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-template-named-def.html" id="id1594">BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-trait-def.html" id="id1595">BOOST_MPL_HAS_XXX_TRAIT_DEF</a></li>

doc/refmanual/list.html

@@ -142,7 +142,7 @@ of <tt class="literal"><span class="pre">l</span></tt> in  the same order; see
 <h3><a class="subsection-title" href="#example" name="example">Example</a></h3>
 <pre class="literal-block">
 typedef <a href="./list.html" class="identifier">list</a>&lt;float,double,long double&gt; floats;
-typedef <a href="./push-front.html" class="identifier">push_front</a>&lt;floats,int&gt;::type types;
+typedef <a href="./push-front.html" class="identifier">push_front</a>&lt;floating_types,int&gt;::type types;
 
 <a href="./assert.html" class="identifier">BOOST_MPL_ASSERT</a>(( is_same&lt; <a href="./front.html" class="identifier">front</a>&lt;types&gt;::type, int > ));
 </pre>

doc/refmanual/refmanual_toc.html

@@ -276,7 +276,6 @@
 </ul>
 </li>
 <li><a class="reference internal" href="./introspection.html" id="id1592">Introspection</a><ul class="toc" id="outline">
-<li><a class="reference internal" href="./get-tag-def.html" id="id1615">BOOST_MPL_GET_TAG_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-template-def.html" id="id1593">BOOST_MPL_HAS_XXX_TEMPLATE_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-template-named-def.html" id="id1594">BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF</a></li>
 <li><a class="reference internal" href="./has-xxx-trait-def.html" id="id1595">BOOST_MPL_HAS_XXX_TRAIT_DEF</a></li>

doc/refmanual/transformation-algorithms.html

@@ -19,7 +19,7 @@ ones by performing some kind of transformation. A typical transformation
 alogrithm takes one or more input sequences and a transformation
 metafunction/predicate, and returns a new sequence built according to the
 algorithm's semantics through the means of its <a class="reference internal" href="./inserter.html">Inserter</a> argument, which
-plays a role similar to the role of run-time <a class="reference external" href="https://boost.org/sgi/stl/OutputIterator.html" target="_top">Output Iterator</a>.</p>
+plays a role similar to the role of run-time <a class="reference external" href="http://www.sgi.com/tech/stl/OutputIterator.html" target="_top">Output Iterator</a>.</p>
 <!-- Say something about optionality of Inserters/their default behavior -->
 <p>Every transformation algorithm is a <a class="reference internal" href="./reversible-algorithm.html">Reversible Algorithm</a>, providing
 an accordingly named <tt class="literal"><span class="pre">reverse_</span></tt> counterpart carrying the transformation

doc/src/refmanual/Acknowledgements.rst

@@ -2,7 +2,7 @@
 The format and language of this reference documentation has been greatly influenced by 
 the SGI's `Standard Template Library Programmer's Guide`__.
 
-__ https://boost.org/sgi/stl/
+__ http://www.sgi.com/tech/stl/
 
 
 .. copyright:: Copyright ©  2001-2009 Aleksey Gurtovoy and David Abrahams

doc/src/refmanual/Algorithms.rst

@@ -35,7 +35,7 @@ common functionality documented by the |Reversible Algorithm|
 concept.
 
 
-.. |Output Iterator| replace:: `Output Iterator <https://boost.org/sgi/stl/OutputIterator.html>`__
+.. |Output Iterator| replace:: `Output Iterator <http://www.sgi.com/tech/stl/OutputIterator.html>`__
 .. |sequence algorithms| replace:: `sequence algorithms`_
 .. _`sequence algorithms`: `Algorithms`_
 

doc/src/refmanual/Iterators.rst

@@ -5,7 +5,7 @@ it possible to decouple `algorithms`__ from concrete compile-time `sequence
 implementations`__. Under the hood, all MPL sequence algorithms are 
 implemented in terms of iterators. In particular, that means that they 
 will work on any custom compile-time sequence, given that the appropriate 
-iterator interface is provided.
+iterator inteface is provided.
 
 __ `Algorithms`_
 __ `label-Sequences-Classes`_
@@ -14,6 +14,6 @@ __ `label-Sequences-Classes`_
 .. More?
 
 
-.. copyright:: Copyright ©  2001-2009 Aleksey Gurtovoy and David Abrahams
+.. copyright:: Copyright ©  2001-2009 Aleksey Gurtovoy and David Abrahams
    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)

doc/src/refmanual/for_each.rst

@@ -136,7 +136,7 @@ See also
 
 |Runtime Algorithms|, |Views|, |transform_view|
 
-.. |unary function object| replace:: `unary function object <https://boost.org/sgi/stl/UnaryFunction.html>`__
+.. |unary function object| replace:: `unary function object <http://www.sgi.com/tech/stl/UnaryFunction.html>`__
 .. |value_initialized| replace:: `value_initialized <http://www.boost.org/libs/utility/value_init.htm>`__
 
 

doc/src/refmanual/list.rst

@@ -102,7 +102,7 @@ Example
 .. parsed-literal::
     
     typedef list<float,double,long double> floats;
-    typedef push_front<floats,int>::type types;
+    typedef push_front<floating_types,int>::type types;
     
     BOOST_MPL_ASSERT(( is_same< front<types>::type, int > ));
 

doc/tutorial/apply-lambda-semantics.html

@@ -78,7 +78,7 @@ one.</p>
 </ol>
 <p>To get a detailed picture of the new apply/lambda semantics, please
 see the test case at
-<a class="reference" href="../../test/apply.cpp" target="_top">libs/mpl/test/apply.cpp</a>
+<a class="reference" href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/libs/mpl/test/apply.cpp?view=markup" target="_top">http://cvs.sourceforge.net/viewcvs.py/boost/boost/libs/mpl/test/apply.cpp?view=markup</a>
 and the corresponding sections of the MPL <a class="reference" href="./reference-manual.html">reference manual</a>.</p>
 <table class="footnote" frame="void" id="id21" rules="none">
 <colgroup><col class="label" /><col /></colgroup>

doc/tutorial/incomplete-support-for.html

@@ -113,7 +113,7 @@ arguments), which comes down to the follwing two criteria:</p>
 placeholders do contain these).</li>
 </ol>
 <p>If these two hold, you can safely put <tt class="literal"><span class="pre">BOOST_MPL_AUX_LAMBDA_SUPPORT</span></tt> inside
-your metafunction and forget about the issue.  If not, you are out of luck and
+your metafunction and forget about the issue.  If not, your are out of luck and
 probably have to write a metafunction class instead.</p>
 <p>The good news are that most of the MPL's own metafunctions and <a class="reference" href="../../../type_traits/index.html" target="_top">Boost.Type Traits</a>
 templates are &quot;placeholder-safe&quot; and have the workaround applied to them, so

doc/tutorial/numeric-metafunction.html

@@ -24,7 +24,7 @@ arguments of different types, and the result will yield the
 largest/most general of the argument types. The infrastructure
 allows user-defined numeric types to be freely intermixed with
 predefined library types. See
-<a class="reference" href="../../test/numeric_ops.cpp" target="_top">libs/mpl/test/numeric_ops.cpp</a>
+<a class="reference" href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/libs/mpl/test/numeric_ops.cpp?view=markup" target="_top">http://cvs.sourceforge.net/viewcvs.py/boost/boost/libs/mpl/test/numeric_ops.cpp?view=markup</a>
 for an illustrative example, and the <a class="reference" href="./reference-manual.html">reference manual</a> for
 the formal infrastructure specification.</p>
 <p>If you were using MPL numeric metafunctions on your own integral

doc/tutorial/resources.html

@@ -33,12 +33,12 @@ Complete Guide</a>&quot;, by David Vandevoorde and Nicolai M. Josuttis — <em>t
 on the details and workings of the C++ template system.</p>
 <p>We can also recommend a number online resources:</p>
 <ul class="simple">
-<li>Todd L. Veldhuizen, &quot;<a class="reference" href="https://dl.acm.org/citation.cfm?id=260748" target="_top">Using C++ template metaprograms</a>&quot;, C++ Report 
+<li>Todd L. Veldhuizen, &quot;<a class="reference" href="http://osl.iu.edu/~tveldhui/papers/Template-Metaprograms/meta-art.html" target="_top">Using C++ template metaprograms</a>&quot;, C++ Report 
 Vol. 7 No. 4 (May 1995), pp. 36-43.</li>
-<li>Todd L. Veldhuizen and Dennis Gannon, &quot;<a class="reference" href="https://arxiv.org/abs/math/9810022" target="_top">Active Libraries: Rethinking the roles of 
+<li>Todd L. Veldhuizen and Dennis Gannon, &quot;<a class="reference" href="http://osl.iu.edu/~tveldhui/papers/oo98.html" target="_top">Active Libraries: Rethinking the roles of 
 compilers and libraries</a>&quot;, SIAM Workshop on Object Oriented Methods for Inter-operable 
 Scientific and Engineering Computing, October 21-23, 1998</li>
-<li>Todd L. Veldhuizen, &quot;<a class="reference" href="https://arxiv.org/abs/cs/9810010" target="_top">C++ Templates as Partial Evaluation</a>&quot;, 1999 ACM SIGPLAN 
+<li>Todd L. Veldhuizen, &quot;<a class="reference" href="http://osl.iu.edu/~tveldhui/papers/pepm99/" target="_top">C++ Templates as Partial Evaluation</a>&quot;, 1999 ACM SIGPLAN 
 Workshop on Partial Evaluation and Semantics-Based Program Manipulation (PEPM'99).</li>
 </ul>
 <!-- What about Todd's PhD dissertation?  Too far off the beaten track? -->

example/Jamfile.v2

@@ -1,15 +0,0 @@
-#  Boost.MPL Library example Jamfile
-#
-#  Copyright (c) 2008 James E. King III
-#
-#  Distributed under the Boost Software License, Version 1.0. (See accompany-
-#  ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-import testing ;
-
-test-suite "mpl-examples"
-   :    [ run     inherit_linearly.cpp ]
-        [ compile integer.cpp ]
-        [ run     tuple_from_list.cpp ]
-   ;
-

example/fsm/aux_/base_event.hpp

@@ -15,7 +15,6 @@
 // $Revision$
 
 #include <memory>
-#include <boost/config.hpp>
 
 namespace fsm { namespace aux {
 
@@ -26,32 +25,13 @@ struct base_event
  public:
     virtual ~base_event() {};
     
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
     std::auto_ptr<base_event> clone() const
-    
-#else
-
-    std::unique_ptr<base_event> clone() const
-    
-#endif
-
     {
         return do_clone();
     }
  
  private:
-
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
     virtual std::auto_ptr<base_event> do_clone() const = 0;
-    
-#else
-
-    virtual std::unique_ptr<base_event> do_clone() const = 0;
-    
-#endif
-
 };
 
 }}

example/fsm/aux_/event.hpp

@@ -26,27 +26,12 @@ struct event
     typedef base_event base_t;
 
  private:
-
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
     virtual std::auto_ptr<base_event> do_clone() const
     {
         return std::auto_ptr<base_event>(
               new Derived(static_cast<Derived const&>(*this))
             );
     }
-    
-#else
-
-    virtual std::unique_ptr<base_event> do_clone() const
-    {
-        return std::unique_ptr<base_event>(
-              new Derived(static_cast<Derived const&>(*this))
-            );
-    }
-    
-#endif
-
 };
 
 }}

example/fsm/state_machine.hpp

@@ -83,17 +83,7 @@ class state_machine
     {
     }
 
-
-#if defined(BOOST_NO_CXX11_SMART_PTR)
-
     void post_event(std::auto_ptr<base_event_t const> evt)
-    
-#else
-
-    void post_event(std::unique_ptr<base_event_t const> evt)
-    
-#endif
-
     {
         m_events_queue.push(base_event_ptr_t(evt.release()));
     }

include/boost/mpl/always.hpp

@@ -14,7 +14,7 @@
 // $Date$
 // $Revision$
 
-#include <boost/mpl/aux_/preprocessor/default_params.hpp>
+#include <boost/mpl/aux_/preprocessor/def_params_tail.hpp>
 #include <boost/mpl/aux_/na.hpp>
 #include <boost/mpl/aux_/arity_spec.hpp>
 
@@ -23,7 +23,8 @@ namespace boost { namespace mpl {
 template< typename Value > struct always
 {
     template<
-        BOOST_MPL_PP_DEFAULT_PARAMS(BOOST_MPL_LIMIT_METAFUNCTION_ARITY, typename T, na)
+          typename T
+        BOOST_MPL_PP_NESTED_DEF_PARAMS_TAIL(1, typename T, na)
         >
     struct apply
     {
@@ -31,7 +32,7 @@ template< typename Value > struct always
     };
 };
 
-BOOST_MPL_AUX_ARITY_SPEC(0, always)
+BOOST_MPL_AUX_ARITY_SPEC(1, always)
 
 }}
 

include/boost/mpl/and.hpp

@@ -28,7 +28,7 @@
 // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'and' being an alternative token
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER) 
 #ifndef __GCCXML__
 #if defined(and) 
 #   pragma push_macro("and")
@@ -41,7 +41,7 @@
 #   define BOOST_MPL_PREPROCESSED_HEADER and.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER)
 #ifndef __GCCXML__
 #if defined(and) 
 #   pragma pop_macro("and")

include/boost/mpl/assert.hpp

@@ -25,7 +25,6 @@
 #include <boost/mpl/aux_/config/dtp.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/msvc.hpp>
-#include <boost/mpl/aux_/config/gpu.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
 #include <boost/mpl/aux_/config/pp_counter.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
@@ -35,11 +34,8 @@
 #include <boost/config.hpp> // make sure 'size_t' is placed into 'std'
 #include <cstddef>
 
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1700)
-#include <boost/mpl/if.hpp>
-#endif
 
-#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
     || (BOOST_MPL_CFG_GCC != 0) \
     || BOOST_WORKAROUND(__IBMCPP__, <= 600)
 #   define BOOST_MPL_CFG_ASSERT_USE_RELATION_NAMES
@@ -47,7 +43,7 @@
 
 #if BOOST_WORKAROUND(__MWERKS__, < 0x3202) \
     || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
-    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+    || BOOST_WORKAROUND(__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,8 +51,8 @@
 // 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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
-    || (BOOST_MPL_CFG_GCC != 0) || (BOOST_MPL_CFG_GPU != 0) || defined(__PGI)
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \
+    || (BOOST_MPL_CFG_GCC != 0)
 #   define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) enum { expr }
 #else
 #   define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) BOOST_STATIC_CONSTANT(T, expr)
@@ -135,38 +131,8 @@ template< assert_::relations r, long x, long y > struct assert_relation {};
 
 #endif 
 
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1700)
 
-template<class Pred>
-struct extract_assert_pred;
-
-template<class Pred>
-struct extract_assert_pred<void(Pred)> { typedef Pred type; };
-
-template<class Pred>
-struct eval_assert {
-    typedef typename extract_assert_pred<Pred>::type P;
-    typedef typename P::type p_type;
-    typedef typename ::boost::mpl::if_c<p_type::value,
-        AUX778076_ASSERT_ARG(assert<false>),
-        failed ************ P::************
-    >::type type;
-};
-
-template<class Pred>
-struct eval_assert_not {
-    typedef typename extract_assert_pred<Pred>::type P;
-    typedef typename P::type p_type;
-    typedef typename ::boost::mpl::if_c<!p_type::value,
-        AUX778076_ASSERT_ARG(assert<false>),
-        failed ************ ::boost::mpl::not_<P>::************
-    >::type type;
-};
-
-template< typename T >
-T make_assert_arg();
-
-#elif !defined(BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER)
+#if !defined(BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER)
 
 template< bool > struct assert_arg_pred_impl { typedef int type; };
 template<> struct assert_arg_pred_impl<true> { typedef void* type; };
@@ -184,27 +150,16 @@ template< typename P > struct assert_arg_pred_not
     typedef typename assert_arg_pred_impl<p>::type type;
 };
 
-#if defined(BOOST_GCC) && BOOST_GCC >= 80000
-#define BOOST_MPL_IGNORE_PARENTHESES_WARNING
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wparentheses"
-#endif
-
 template< typename Pred >
-failed ************ (Pred::************
+failed ************ (Pred::************ 
       assert_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type )
     );
 
 template< typename Pred >
-failed ************ (boost::mpl::not_<Pred>::************
+failed ************ (boost::mpl::not_<Pred>::************ 
       assert_not_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type )
     );
 
-#ifdef BOOST_MPL_IGNORE_PARENTHESES_WARNING
-#undef BOOST_MPL_IGNORE_PARENTHESES_WARNING
-#pragma GCC diagnostic pop
-#endif
-
 template< typename Pred >
 AUX778076_ASSERT_ARG(assert<false>)
 assert_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type );
@@ -256,39 +211,6 @@ assert_rel_arg( assert_relation<r,x,y> );
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_CLOSE
 
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1700)
-
-// BOOST_MPL_ASSERT((pred<x,...>))
-
-#define BOOST_MPL_ASSERT(pred) \
-BOOST_MPL_AUX_ASSERT_CONSTANT( \
-      std::size_t \
-    , BOOST_PP_CAT(mpl_assertion_in_line_,BOOST_MPL_AUX_PP_COUNTER()) = sizeof( \
-          boost::mpl::assertion_failed<false>( \
-              boost::mpl::make_assert_arg< \
-                  typename boost::mpl::eval_assert<void pred>::type \
-                >() \
-            ) \
-        ) \
-    ) \
-/**/
-
-// BOOST_MPL_ASSERT_NOT((pred<x,...>))
-
-#define BOOST_MPL_ASSERT_NOT(pred) \
-BOOST_MPL_AUX_ASSERT_CONSTANT( \
-      std::size_t \
-    , BOOST_PP_CAT(mpl_assertion_in_line_,BOOST_MPL_AUX_PP_COUNTER()) = sizeof( \
-          boost::mpl::assertion_failed<false>( \
-              boost::mpl::make_assert_arg< \
-                  typename boost::mpl::eval_assert_not<void pred>::type \
-                >() \
-            ) \
-        ) \
-    ) \
-/**/
-
-#else
 
 // BOOST_MPL_ASSERT((pred<x,...>))
 
@@ -328,8 +250,6 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \
 /**/
 #endif
 
-#endif
-
 // BOOST_MPL_ASSERT_RELATION(x, ==|!=|<=|<|>=|>, y)
 
 #if defined(BOOST_MPL_CFG_ASSERT_USE_RELATION_NAMES)
@@ -443,17 +363,8 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \
 /**/
 #endif
 
-#if 0
-// Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8.
-// #if defined(BOOST_MSVC) && BOOST_MSVC < 1500
-#   include <boost/static_assert.hpp>
-#   define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
-BOOST_STATIC_ASSERT_MSG( c, #msg ) \
-/**/
-#else
-#   define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
+#define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \
 BOOST_MPL_ASSERT_MSG_IMPL( BOOST_MPL_AUX_PP_COUNTER(), c, msg, types_ ) \
 /**/
-#endif
 
 #endif // BOOST_MPL_ASSERT_HPP_INCLUDED

include/boost/mpl/aux_/common_name_wknd.hpp

@@ -16,7 +16,7 @@
 
 #include <boost/mpl/aux_/config/workaround.hpp>
 
-#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x561)
+#if BOOST_WORKAROUND(__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 // BOOST_BORLANDC
+#endif // __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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+    && ( BOOST_WORKAROUND(__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(BOOST_BORLANDC, >= 0x590) \
-    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(__BORLANDC__, >= 0x590) \
+    && BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#   elif BOOST_WORKAROUND(__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(BOOST_BORLANDC, >= 0x590)
+#       elif BOOST_WORKAROUND(__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(BOOST_BORLANDC, < 0x582)
+    && BOOST_WORKAROUND(__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(BOOST_BORLANDC, >= 0x560) \
-    && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(__BORLANDC__, >= 0x560) \
+    && BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_NO_NESTED_FORWARDING
 

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

@@ -1,35 +0,0 @@
-
-#ifndef BOOST_MPL_AUX_CONFIG_GPU_HPP_INCLUDED
-#define BOOST_MPL_AUX_CONFIG_GPU_HPP_INCLUDED
-
-// Copyright Eric Niebler 2014
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-#include <boost/config.hpp>
-
-#if !defined(BOOST_MPL_CFG_GPU_ENABLED) \
-
-#   define BOOST_MPL_CFG_GPU_ENABLED BOOST_GPU_ENABLED
-
-#endif
-
-#if defined __CUDACC__
-
-#    define BOOST_MPL_CFG_GPU 1
-
-#else
-
-#    define BOOST_MPL_CFG_GPU 0
-
-#endif
-
-#endif // BOOST_MPL_AUX_CONFIG_GPU_HPP_INCLUDED

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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+    && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
 
 #   define BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS
 

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

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

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(BOOST_BORLANDC, < 0x590) \
+    && (   BOOST_WORKAROUND(__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(BOOST_BORLANDC, < 0x582) \
+        || BOOST_WORKAROUND(__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( BOOST_BORLANDC, BOOST_TESTED_AT( 0x590) ) \
+      || BOOST_WORKAROUND( __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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \
+        || BOOST_WORKAROUND(__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(BOOST_BORLANDC,BOOST_TESTED_AT(0x561))
+#if BOOST_WORKAROUND(__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(BOOST_BORLANDC, < 0x600)
+#   if !BOOST_WORKAROUND(__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(BOOST_BORLANDC, < 0x600)
+#   else // BOOST_WORKAROUND(__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(BOOST_BORLANDC, < 0x600)
+#   endif // BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#elif BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#   if !BOOST_WORKAROUND(__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 // BOOST_BORLANDC
+#   else // __BORLANDC__
 template< typename T >
 struct has_rebind_impl
 {
@@ -90,7 +90,7 @@ struct has_rebind
         >::type
 {
 };
-#   endif // BOOST_BORLANDC
+#   endif // __BORLANDC__
 
 #endif
 

include/boost/mpl/aux_/insert_range_impl.hpp

@@ -14,10 +14,9 @@
 // $Date$
 // $Revision$
 
-#include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/insert.hpp>
+#include <boost/mpl/copy.hpp>
 #include <boost/mpl/clear.hpp>
+#include <boost/mpl/front_inserter.hpp>
 #include <boost/mpl/joint_view.hpp>
 #include <boost/mpl/iterator_range.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
@@ -44,31 +43,29 @@ struct insert_range_impl
         >
     struct apply
 #if !defined(BOOST_MPL_CFG_NO_NESTED_FORWARDING)
-        : reverse_fold<
-              joint_view<
+        : reverse_copy<
+              joint_view< 
                   iterator_range<typename begin<Sequence>::type,Pos>
-                , joint_view<
+                , joint_view< 
                       Range
                     , iterator_range<Pos,typename end<Sequence>::type>
                     >
                 >
-            , typename clear<Sequence>::type
-            , insert<_1, begin<_1>, _2>
+            , front_inserter< typename clear<Sequence>::type >
             >
     {
 #else
     {
-        typedef typename reverse_fold<
-                joint_view<
-                    iterator_range<typename begin<Sequence>::type,Pos>
-                  , joint_view<
-                        Range
-                      , iterator_range<Pos,typename end<Sequence>::type>
-                      >
-                  >
-              , typename clear<Sequence>::type
-              , insert<_1, begin<_1>, _2>
-              >::type type;
+        typedef typename reverse_copy<
+              joint_view< 
+                  iterator_range<typename begin<Sequence>::type,Pos>
+                , joint_view< 
+                      Range
+                    , iterator_range<Pos,typename end<Sequence>::type>
+                    >
+                >
+            , front_inserter< typename clear<Sequence>::type >
+            >::type type;
 #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(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
+#elif BOOST_WORKAROUND(__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;
@@ -77,7 +77,7 @@ struct AUX_WRAPPER_NAME
     // functions that return objects of both arithmetic ('int', 'long',
     // 'double', etc.) and wrapped integral types (for an example, see 
     // "mpl/example/power.cpp")
-    BOOST_CONSTEXPR operator AUX_WRAPPER_VALUE_TYPE() const { return static_cast<AUX_WRAPPER_VALUE_TYPE>(this->value); } 
+    operator AUX_WRAPPER_VALUE_TYPE() const { return static_cast<AUX_WRAPPER_VALUE_TYPE>(this->value); } 
 };
 
 #if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)

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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(__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(BOOST_BORLANDC)
+#   if !defined(__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 // BOOST_BORLANDC
+#   endif // __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(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
+    || BOOST_WORKAROUND(__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,10 +29,6 @@
     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
@@ -61,14 +57,6 @@
         ) \
     /**/
 
-#   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,10 +29,6 @@
     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
@@ -64,14 +60,6 @@
         ) \
     /**/
 
-#   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_/preprocessor/range.hpp

@@ -15,16 +15,9 @@
 // $Revision$
 
 #include <boost/preprocessor/seq/subseq.hpp>
-#include <boost/preprocessor/repetition/repeat.hpp>
-#include <boost/preprocessor/arithmetic/add.hpp>
-
-#define BOOST_MPL_PP_RANGE_ITEM(z,n,_) (n)
 
 #define BOOST_MPL_PP_RANGE(first, length) \
-    BOOST_PP_SEQ_SUBSEQ( \
-        BOOST_PP_REPEAT(BOOST_PP_ADD(first,length), BOOST_MPL_PP_RANGE_ITEM, _), \
-        first, length \
-    ) \
+    BOOST_PP_SEQ_SUBSEQ((0)(1)(2)(3)(4)(5)(6)(7)(8)(9), first, length) \
 /**/
 
 #endif // BOOST_MPL_AUX_PREPROCESSOR_RANGE_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(BOOST_BORLANDC, BOOST_TESTED_AT(0x561))
+#if !BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \
+#if BOOST_WORKAROUND(__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/aux_/unwrap.hpp

@@ -16,12 +16,10 @@
 // $Revision$
 
 #include <boost/ref.hpp>
-#include <boost/mpl/aux_/config/gpu.hpp>
 
 namespace boost { namespace mpl { namespace aux {
 
 template< typename F >
-BOOST_MPL_CFG_GPU_ENABLED
 inline
 F& unwrap(F& f, long)
 {
@@ -29,7 +27,6 @@ F& unwrap(F& f, long)
 }
 
 template< typename F >
-BOOST_MPL_CFG_GPU_ENABLED
 inline
 F&
 unwrap(reference_wrapper<F>& f, int)
@@ -38,7 +35,6 @@ unwrap(reference_wrapper<F>& f, int)
 }
 
 template< typename F >
-BOOST_MPL_CFG_GPU_ENABLED
 inline
 F&
 unwrap(reference_wrapper<F> const& f, int)

include/boost/mpl/bitand.hpp

@@ -19,7 +19,7 @@
 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitand)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'bitand' being an alternative token
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER) 
 #ifndef __GCCXML__
 #if defined(bitand)
 #   pragma push_macro("bitand")
@@ -34,7 +34,7 @@
 #define AUX778076_OP_TOKEN  &
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER)
 #ifndef __GCCXML__
 #if defined(bitand)
 #   pragma pop_macro("bitand")

include/boost/mpl/bitor.hpp

@@ -19,7 +19,7 @@
 // macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'bitor' being an alternative token
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER) 
 #ifndef __GCCXML__
 #if defined(bitor)
 #   pragma push_macro("bitor")
@@ -34,7 +34,7 @@
 #define AUX778076_OP_TOKEN  |
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER)
 #ifndef __GCCXML__
 #if defined(bitor)
 #   pragma pop_macro("bitor")

include/boost/mpl/bool.hpp

@@ -26,7 +26,7 @@ template< bool C_ > struct bool_
     typedef integral_c_tag tag;
     typedef bool_ type;
     typedef bool value_type;
-    BOOST_CONSTEXPR operator bool() const { return this->value; }
+    operator bool() const { return this->value; }
 };
 
 #if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)

include/boost/mpl/empty_base.hpp

@@ -17,11 +17,12 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/aux_/config/msvc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
-#include <boost/mpl/aux_/lambda_support.hpp>
 
-#include <boost/type_traits/integral_constant.hpp>
 #include <boost/type_traits/is_empty.hpp>
 
+// should be always the last #include directive
+#include <boost/type_traits/detail/bool_trait_def.hpp>
+
 namespace boost { namespace mpl {
 
 // empty base class, guaranteed to have no members; inheritance from
@@ -50,14 +51,9 @@ struct is_empty_base<empty_base>
 }}
 
 namespace boost {
-
-template<> struct is_empty< mpl::empty_base >
-    : public ::boost::integral_constant<bool,true>
-{
-public:
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(1,is_empty,(mpl::empty_base))
-};
-
+BOOST_TT_AUX_BOOL_TRAIT_SPEC1(is_empty, mpl::empty_base, true)
 }
 
+#include <boost/type_traits/detail/bool_trait_undef.hpp>
+
 #endif // BOOST_MPL_EMPTY_BASE_HPP_INCLUDED

include/boost/mpl/empty_sequence.hpp

@@ -23,8 +23,7 @@ namespace boost { namespace mpl {
 
 struct empty_sequence
 {
-    struct tag;
-    typedef empty_sequence type;
+    struct tag; 
     struct begin { typedef random_access_iterator_tag category; };    
     typedef begin end;
 };

include/boost/mpl/eval_if.hpp

@@ -4,8 +4,8 @@
 
 // Copyright Aleksey Gurtovoy 2000-2004
 //
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/mpl for documentation.
@@ -43,7 +43,7 @@ struct eval_if
     BOOST_MPL_AUX_LAMBDA_SUPPORT(3,eval_if,(C,F1,F2))
 };
 
-// (almost) copy & paste in order to save one more
+// (almost) copy & paste in order to save one more 
 // recursively nested template instantiation to user
 template<
       bool C

include/boost/mpl/for_each.hpp

@@ -22,7 +22,6 @@
 #include <boost/mpl/deref.hpp>
 #include <boost/mpl/identity.hpp>
 #include <boost/mpl/assert.hpp>
-#include <boost/mpl/aux_/config/gpu.hpp>
 #include <boost/mpl/aux_/unwrap.hpp>
 
 #include <boost/type_traits/is_same.hpp>
@@ -41,7 +40,6 @@ struct for_each_impl
         , typename TransformFunc
         , typename F
         >
-    BOOST_MPL_CFG_GPU_ENABLED
     static void execute(
           Iterator*
         , LastIterator*
@@ -61,7 +59,6 @@ struct for_each_impl<false>
         , typename TransformFunc
         , typename F
         >
-    BOOST_MPL_CFG_GPU_ENABLED
     static void execute(
           Iterator*
         , LastIterator*
@@ -92,7 +89,6 @@ template<
     , typename TransformOp
     , typename F
     >
-BOOST_MPL_CFG_GPU_ENABLED
 inline
 void for_each(F f, Sequence* = 0, TransformOp* = 0)
 {
@@ -109,13 +105,10 @@ template<
       typename Sequence
     , typename F
     >
-BOOST_MPL_CFG_GPU_ENABLED
 inline
 void for_each(F f, Sequence* = 0)
 {
-  // jfalcou: fully qualifying this call so it doesnt clash with phoenix::for_each
-  // ons ome compilers -- done on 02/28/2011
-  boost::mpl::for_each<Sequence, identity<> >(f);
+    for_each<Sequence, identity<> >(f);
 }
 
 }}

include/boost/mpl/get_tag.hpp

@@ -1,26 +0,0 @@
-
-#ifndef BOOST_MPL_GET_TAG_HPP_INCLUDED
-#define BOOST_MPL_GET_TAG_HPP_INCLUDED
-
-// Copyright Sergey Krivonos 2017
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-
-#define BOOST_MPL_GET_TAG_DEF(TAG) \
-    namespace boost { namespace mpl { \
-        template<typename T> \
-        struct get_##TAG { \
-            typedef typename T::TAG type; \
-        }; \
-    }}
-
-#endif

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( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) )
+#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) )
 # include <boost/type_traits/is_class.hpp>
 #endif
 
@@ -155,11 +155,10 @@ template<> struct trait<T> \
 // SFINAE-based implementations below are derived from a USENET newsgroup's 
 // posting by Rani Sharoni (comp.lang.c++.moderated, 2002-03-17 07:45:09 PST)
 
-#   elif BOOST_WORKAROUND(BOOST_MSVC, <= 1400) \
-      || (BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) && defined(__CUDACC__)) \
+#   elif BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \
       || BOOST_WORKAROUND(__IBMCPP__, <= 700)
 
-// MSVC 7.1 & MSVC 8.0 & VACPP
+// MSVC 7.1+ & VACPP
 
 // agurt, 15/jun/05: replace overload-based SFINAE implementation with SFINAE
 // applied to partial specialization to fix some apparently random failures 
@@ -196,7 +195,7 @@ struct trait \
 }; \
 /**/
 
-#   elif BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) )
+#   elif BOOST_WORKAROUND( __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 > \
@@ -291,24 +290,18 @@ struct trait \
 #   if !defined(BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES)
 #     if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
 #       define BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES 1
-#     else
-#       define BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES 0
 #     endif
 #   endif
 
 #   if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION)
 #     if (defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS))
 #       define BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION 1
-#     else
-#       define BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION 0
 #     endif
 #   endif
 
 #   if !defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE)
 #     if BOOST_WORKAROUND(BOOST_MSVC, <= 1400)
 #       define BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE 1
-#     else
-#       define BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE 0
 #     endif
 #   endif
 
@@ -334,7 +327,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_Z(z, BOOST_PP_INC(n), typename V) > class V \
+          template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename V) > class V \
        > \
       struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME(args, n) { \
       }; \
@@ -503,7 +496,7 @@ struct trait \
                  z, n, args \
              ) \
         template< \
-             template< BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), typename U) > class U \
+             template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename U) > class U \
         > \
         struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME_WITH_TEMPLATE_SFINAE( \
                 args, n \

include/boost/mpl/if.hpp

@@ -46,7 +46,7 @@ struct if_c<false,T1,T2>
 };
 
 // agurt, 05/sep/04: nondescriptive parameter names for the sake of DigitalMars
-// (and possibly MWCW < 8.0); see https://lists.boost.org/Archives/boost/2004/09/71383.php
+// (and possibly MWCW < 8.0); see http://article.gmane.org/gmane.comp.lib.boost.devel/108959
 template<
       typename BOOST_MPL_AUX_NA_PARAM(T1)
     , typename BOOST_MPL_AUX_NA_PARAM(T2)

include/boost/mpl/integral_c.hpp

@@ -33,7 +33,7 @@
 
 
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
- && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551)
+ && !BOOST_WORKAROUND(__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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
 #   define BOOST_MPL_CFG_STRIPPED_DOWN_LOWER_BOUND_IMPL
 #endif
 

include/boost/mpl/map/aux_/insert_range_impl.hpp

@@ -1,41 +0,0 @@
-
-#ifndef BOOST_MPL_MAP_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED
-#define BOOST_MPL_MAP_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED
-
-// Copyright Bruno Dutra 2015
-//
-// Distributed under the Boost Software License, Version 1.0. 
-// (See accompanying file LICENSE_1_0.txt or copy at 
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-#include <boost/mpl/insert_range_fwd.hpp>
-#include <boost/mpl/map/aux_/tag.hpp>
-#include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/insert.hpp>
-
-namespace boost { namespace mpl {
-
-template<>
-struct insert_range_impl< aux::map_tag >
-{
-    template<
-          typename Sequence
-        , typename /*Pos*/
-        , typename Range
-        >
-    struct apply
-        : fold<Range, Sequence, insert<_1, _2> >
-    {
-    };
-};
-
-}}
-
-#endif // BOOST_MPL_MAP_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED

include/boost/mpl/map/aux_/item.hpp

@@ -40,7 +40,6 @@ struct m_item
     typedef Key         key_;
     typedef pair<Key,T> item;
     typedef Base        base;
-    typedef m_item      type;
     
     typedef typename next< typename Base::size >::type  size;
     typedef typename next< typename Base::order >::type order;
@@ -63,7 +62,6 @@ struct m_mask
 {
     typedef void_   key_;
     typedef Base    base;
-    typedef m_mask  type;
 
     typedef typename prior< typename Base::size >::type  size;
     typedef typename x_order_impl<Base,Key>::type key_order_;
@@ -125,7 +123,6 @@ struct m_mask
 {
     typedef void_   key_;
     typedef Base    base;
-    typedef m_mask  type;
 
     typedef typename prior< typename Base::size >::type  size;
     typedef typename x_order_impl<Base,Key>::type key_order_;

include/boost/mpl/map/map0.hpp

@@ -19,7 +19,6 @@
 #include <boost/mpl/map/aux_/at_impl.hpp>
 //#include <boost/mpl/map/aux_/O1_size.hpp>
 #include <boost/mpl/map/aux_/insert_impl.hpp>
-#include <boost/mpl/map/aux_/insert_range_impl.hpp>
 #include <boost/mpl/map/aux_/erase_impl.hpp>
 #include <boost/mpl/map/aux_/erase_key_impl.hpp>
 #include <boost/mpl/map/aux_/has_key_impl.hpp>

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(BOOST_BORLANDC, BOOST_TESTED_AT(0x570) )
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(__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/or.hpp

@@ -29,7 +29,7 @@
 // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
 // has to be checked in a separate condition, otherwise GCC complains 
 // about 'or' being an alternative token
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER)
 #ifndef __GCCXML__
 #if defined(or)
 #   pragma push_macro("or")
@@ -42,7 +42,7 @@
 #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER) 
 #ifndef __GCCXML__
 #if defined(or)
 #   pragma pop_macro("or")

include/boost/mpl/print.hpp

@@ -37,7 +37,8 @@ namespace aux {
       static const unsigned value = 1;
   };
 #endif
-} // namespace aux
+} // namespace aux 
+
 
 template <class T>
 struct print
@@ -46,12 +47,7 @@ struct print
     , aux::print_base
 #endif 
 {
-#if defined(__clang__)
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wc++11-extensions"
-    const int m_x = 1 / (sizeof(T) - sizeof(T));
-# pragma clang diagnostic pop
-#elif defined(BOOST_MSVC)
+#if defined(BOOST_MSVC)
     enum { n = sizeof(T) + -1 };
 #elif defined(__MWERKS__)
     void f(int);

include/boost/mpl/set/aux_/insert_range_impl.hpp

@@ -1,41 +0,0 @@
-
-#ifndef BOOST_MPL_SET_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED
-#define BOOST_MPL_SET_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED
-
-// Copyright Bruno Dutra 2015
-//
-// Distributed under the Boost Software License, Version 1.0. 
-// (See accompanying file LICENSE_1_0.txt or copy at 
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-#include <boost/mpl/insert_range_fwd.hpp>
-#include <boost/mpl/set/aux_/tag.hpp>
-#include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/fold.hpp>
-#include <boost/mpl/insert.hpp>
-
-namespace boost { namespace mpl {
-
-template<>
-struct insert_range_impl< aux::set_tag >
-{
-    template<
-          typename Sequence
-        , typename /*Pos*/
-        , typename Range
-        >
-    struct apply
-        : fold<Range, Sequence, insert<_1, _2> >
-    {
-    };
-};
-
-}}
-
-#endif // BOOST_MPL_SET_AUX_INSERT_RANGE_IMPL_HPP_INCLUDED

include/boost/mpl/set/aux_/item.hpp

@@ -32,8 +32,7 @@ struct s_item
     typedef s_item<T,Base> item_;
     typedef void_       last_masked_;
     typedef T           item_type_;
-    typedef typename Base::item_ base;
-    typedef s_item type;
+    typedef Base        base;
     
     typedef typename next< typename Base::size >::type  size;
     typedef typename next< typename Base::order >::type order;
@@ -56,9 +55,8 @@ struct s_mask
     typedef s_mask<T,Base> item_;
     typedef T       last_masked_;
     typedef void_   item_type_;
-    typedef typename Base::item_ base;
+    typedef Base    base;
     typedef typename prior< typename Base::size >::type  size;
-    typedef s_mask type;
 
     BOOST_MPL_AUX_SET_OVERLOAD( aux::yes_tag, IS_MASKED, s_mask, aux::type_wrapper<T>* );
 };
@@ -71,7 +69,7 @@ struct s_unmask
     typedef s_unmask<T,Base> item_;
     typedef void_   last_masked_;
     typedef T       item_type_;
-    typedef typename Base::item_ base;
+    typedef Base    base;
     typedef typename next< typename Base::size >::type  size;
 
     BOOST_MPL_AUX_SET_OVERLOAD( aux::no_tag, IS_MASKED, s_unmask, aux::type_wrapper<T>* );

include/boost/mpl/set/set0.hpp

@@ -21,7 +21,6 @@
 #include <boost/mpl/set/aux_/size_impl.hpp>
 #include <boost/mpl/set/aux_/empty_impl.hpp>
 #include <boost/mpl/set/aux_/insert_impl.hpp>
-#include <boost/mpl/set/aux_/insert_range_impl.hpp>
 #include <boost/mpl/set/aux_/erase_impl.hpp>
 #include <boost/mpl/set/aux_/erase_key_impl.hpp>
 #include <boost/mpl/set/aux_/has_key_impl.hpp>

include/boost/mpl/string.hpp

@@ -19,7 +19,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <boost/predef/other/endian.h>
+#include <boost/detail/endian.hpp>
 #include <boost/mpl/limits/string.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/char.hpp>
@@ -59,7 +59,7 @@ namespace boost { namespace mpl
     #define BOOST_MPL_MULTICHAR_LENGTH(c)                                                           \
       (std::size_t)((c<CHAR_MIN) ? 4 : ((c>0xffffff)+(c>0xffff)+(c>0xff)+1))
 
-    #if BOOST_ENDIAN_LITTLE_BYTE && defined(__SUNPRO_CC)
+    #if defined(BOOST_LITTLE_ENDIAN) && defined(__SUNPRO_CC)
 
         #define BOOST_MPL_MULTICHAR_AT(c,i)                                                         \
           (char)(0xff&((unsigned)(c)>>(8*(std::size_t)(i))))
@@ -500,11 +500,11 @@ namespace boost { namespace mpl
     };
 
     #define M0(z, n, data)                                                                            \
-    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> \
+    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>   \
     {                                                                                                 \
         enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == J + 1) };                   \
-        typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string;        \
+        typedef mpl::string<BOOST_PP_ENUM_PARAMS(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_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> \
+    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>   \
     {                                                                                                 \
         enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == 1) };                       \
-        typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string;        \
+        typedef mpl::string<BOOST_PP_ENUM_PARAMS(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(BOOST_BORLANDC, BOOST_TESTED_AT(0x610))
+#if BOOST_WORKAROUND(__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(BOOST_BORLANDC)
+#if !defined(__BORLANDC__)
         : v_at<
               Vector
             , BOOST_MPL_AUX_VALUE_WKND(N)::value

meta/libraries.json

@@ -1,14 +0,0 @@
-{
-    "key": "mpl",
-    "name": "MPL",
-    "authors": [
-        "Aleksey Gurtovoy"
-    ],
-    "description": "The Boost.MPL library is a general-purpose, high-level C++ template metaprogramming framework of compile-time algorithms, sequences and metafunctions. It provides a conceptual foundation and an extensive set of powerful and coherent tools that make doing explict metaprogramming in C++ as easy and enjoyable as possible within the current language.",
-    "category": [
-        "Metaprogramming"
-    ],
-    "maintainers": [
-        "Aleksey Gurtovoy <agurtovoy -at- meta-comm.com>"
-    ]
-}

preprocessed/README.txt

@@ -1,70 +0,0 @@
-Pre-processing of MPL-containers
---------------------------------
-
-Pre-processing of MPL-containers can be accomplished using the script
-"boost_mpl_preprocess.py". In the simple case call it with a single
-argument which is the path to the source-directory of Boost.
-
-  python boost_mpl_preprocess.py <path-to-boost-sourcedir>
-
-If the Boost source-directory is the one this script resides in, you
-can just call it without any arguments.
-
-  python boost_mpl_preprocess.py
-
-Either way, this will pre-process all four MPL-container types (vector,
-list, set, map) and makes them able to hold up to 100 elements. They can
-be used either in their 'numbered' or their 'variadic' form.
-
-Additionally, the script also allows more fine-grained pre-processing.
-The maximal number of elements an MPL-container type is able to hold can
-be different from the one of other MPL-container types and it can also
-differ between its 'numbered' and 'variadic' form.
-To see all options, call the script like this:
-
-  python boost_mpl_preprocess.py --help
-
-
-Fixing pre-processing of MPL-containers
----------------------------------------
-
-Sadly, pre-processing of MPL-containers might fail, if the source-files
-used as input are missing some header-comments required during the pre-
-processing step.
-However, the script "boost_mpl_preprocess.py" makes sure to patch these
-input source-files prior to pre-processing (by implicitly calling script
-"fix_boost_mpl_preprocess.py" with the chosen settings). It only patches
-the source-files needed for pre-processing the selected MPL-container
-types and their selected form ('numbered' or 'variadic').
-If calling it with a single (or no) argument (as in the former section)
-all input source-files will be patched automatically.
-
-Instead of fixing the input-files implicitly during pre-processing one
-can also fix them explicitly by calling "fix_boost_mpl_preprocess.py"
-directly.
-If you just want to test if any fixing is needed call it like this:
-
-  python fix_boost_mpl_preprocess.py --check-only <path-to-boost-sourcedir>
-
-This will tell you if any fixing is needed. In such a case call the script
-"fix_boost_mpl_preprocess.py" like this:
-
-  python fix_boost_mpl_preprocess.py <path-to-boost-sourcedir>
-
-This will fix the header-comments of all the source-files needed during
-pre-processing. Calling "boost_mpl_preprocess.py" afterwards should then
-successfully pre-process the MPL-containers (without the need of implicitly
-fixing any files again).
-
-Note:
-Failure of pre-processing can be checked by examining at least one of the
-following directories in which automatically generated files will be put
-during pre-processing. If at least one file in these directories (or sub-
-directories therein) has a size of zero bytes, fixing is needed.
-
- <path-to-boost-sourcedir>/boost/mpl/vector/aux_/preprocessed/
- <path-to-boost-sourcedir>/boost/mpl/list/aux_/preprocessed/
- <path-to-boost-sourcedir>/boost/mpl/set/aux_/preprocessed/
- <path-to-boost-sourcedir>/boost/mpl/map/aux_/preprocessed/
- <path-to-boost-sourcedir>/boost/mpl/aux_/preprocessed/
-

preprocessed/boost_mpl_preprocess.py

@@ -1,250 +0,0 @@
-# Copyright Deniz Bahadir 2015
-#
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http://www.boost.org/LICENSE_1_0.txt)
-#
-# See http://www.boost.org/libs/mpl for documentation.
-# See http://stackoverflow.com/a/20660264/3115457 for further information.
-# See http://stackoverflow.com/a/29627158/3115457 for further information.
-
-import fix_boost_mpl_preprocess as fixmpl
-import argparse
-import sys
-import os
-import os.path
-import re
-import fileinput
-import shutil
-
-
-def create_more_container_files(sourceDir, suffix, maxElements, containers, containers2):
-    """Creates additional files for the individual MPL-containers."""
-
-    # Create files for each MPL-container with 20 to 'maxElements' elements
-    # which will be used during generation.
-    for container in containers:
-        for i in range(20, maxElements, 10):
-            # Create copy of "template"-file.
-            newFile = os.path.join( sourceDir, container, container + str(i+10) + suffix )
-            shutil.copyfile( os.path.join( sourceDir, container, container + "20" + suffix ), newFile ) 
-            # Adjust copy of "template"-file accordingly.
-            for line in fileinput.input( newFile, inplace=1, mode="rU" ):
-                line = re.sub(r'20', '%TWENTY%', line.rstrip())
-                line = re.sub(r'11', '%ELEVEN%', line.rstrip())
-                line = re.sub(r'10(?![0-9])', '%TEN%', line.rstrip())
-                line = re.sub(r'%TWENTY%', re.escape(str(i+10)), line.rstrip())
-                line = re.sub(r'%ELEVEN%', re.escape(str(i + 1)), line.rstrip())
-                line = re.sub(r'%TEN%', re.escape(str(i)), line.rstrip())
-                print(line)
-    for container in containers2:
-        for i in range(20, maxElements, 10):
-            # Create copy of "template"-file.
-            newFile = os.path.join( sourceDir, container, container + str(i+10) + "_c" + suffix )
-            shutil.copyfile( os.path.join( sourceDir, container, container + "20_c" + suffix ), newFile ) 
-            # Adjust copy of "template"-file accordingly.
-            for line in fileinput.input( newFile, inplace=1, mode="rU" ):
-                line = re.sub(r'20', '%TWENTY%', line.rstrip())
-                line = re.sub(r'11', '%ELEVEN%', line.rstrip())
-                line = re.sub(r'10(?![0-9])', '%TEN%', line.rstrip())
-                line = re.sub(r'%TWENTY%', re.escape(str(i+10)), line.rstrip())
-                line = re.sub(r'%ELEVEN%', re.escape(str(i + 1)), line.rstrip())
-                line = re.sub(r'%TEN%', re.escape(str(i)), line.rstrip())
-                print(line)
-
-
-def create_input_for_numbered_sequences(headerDir, sourceDir, containers, maxElements):
-    """Creates additional source- and header-files for the numbered sequence MPL-containers."""
-    # Create additional container-list without "map".
-    containersWithoutMap = containers[:]
-    try:
-        containersWithoutMap.remove('map')
-    except ValueError:
-        # We can safely ignore if "map" is not contained in 'containers'!
-        pass
-    # Create header/source-files.
-    create_more_container_files(headerDir, ".hpp", maxElements, containers, containersWithoutMap)
-    create_more_container_files(sourceDir, ".cpp", maxElements, containers, containersWithoutMap)
-
-
-def adjust_container_limits_for_variadic_sequences(headerDir, containers, maxElements):
-    """Adjusts the limits of variadic sequence MPL-containers."""
-    for container in containers:
-        headerFile = os.path.join( headerDir, "limits", container + ".hpp" )
-        regexMatch   = r'(define\s+BOOST_MPL_LIMIT_' + container.upper() + r'_SIZE\s+)[0-9]+'
-        regexReplace = r'\g<1>' + re.escape( str(maxElements) )
-        for line in fileinput.input( headerFile, inplace=1, mode="rU" ):
-            line = re.sub(regexMatch, regexReplace, line.rstrip())
-            print(line)
-
-
-def current_boost_dir():
-    """Returns the (relative) path to the Boost source-directory this file is located in (if any)."""
-    # Path to directory containing this script.
-    path = os.path.dirname( os.path.realpath(__file__) )
-    # Making sure it is located in "${boost-dir}/libs/mpl/preprocessed".
-    for directory in reversed( ["libs", "mpl", "preprocessed"] ):
-        (head, tail) = os.path.split(path)
-        if tail == directory:
-            path = head
-        else:
-            return None
-    return os.path.relpath( path )
-    
-
-
-def to_positive_multiple_of_10(string):
-    """Converts a string into its encoded positive integer (greater zero) or throws an exception."""
-    try:
-        value = int(string)
-    except ValueError:
-        msg = '"%r" is not a positive multiple of 10 (greater zero).' % string
-        raise argparse.ArgumentTypeError(msg)
-    if value <= 0 or value % 10 != 0:
-        msg = '"%r" is not a positive multiple of 10 (greater zero).' % string
-        raise argparse.ArgumentTypeError(msg)
-    return value
-
-
-def to_existing_absolute_path(string):
-    """Converts a path into its absolute path and verifies that it exists or throws an exception."""
-    value = os.path.abspath(string)
-    if not os.path.exists( value ) or not os.path.isdir( value ):
-        msg = '"%r" is not a valid path to a directory.' % string
-        raise argparse.ArgumentTypeError(msg)
-    return value
-
-
-def main():
-    """The main function."""
-    
-    # Find the current Boost source-directory in which this script is located.
-    sourceDir = current_boost_dir()
-    if sourceDir == None:
-        sourceDir = ""
-    
-    # Prepare and run cmdline-parser.
-    cmdlineParser = argparse.ArgumentParser(description="A generator-script for pre-processed Boost.MPL headers.")
-    cmdlineParser.add_argument("-v", "--verbose", dest='verbose', action='store_true',
-                               help="Be a little bit more verbose.")
-    cmdlineParser.add_argument("-s", "--sequence-type", dest='seqType', choices=['variadic', 'numbered', 'both'],
-                               default='both',
-                               help="Only update pre-processed headers for the selected sequence types, "
-                                    "either 'numbered' sequences, 'variadic' sequences or 'both' sequence "
-                                    "types. (Default=both)")
-    cmdlineParser.add_argument("--no-vector", dest='want_vector', action='store_false',
-                               help="Do not update pre-processed headers for Boost.MPL Vector.")
-    cmdlineParser.add_argument("--no-list", dest='want_list', action='store_false',
-                               help="Do not update pre-processed headers for Boost.MPL List.")
-    cmdlineParser.add_argument("--no-set", dest='want_set', action='store_false',
-                               help="Do not update pre-processed headers for Boost.MPL Set.")
-    cmdlineParser.add_argument("--no-map", dest='want_map', action='store_false',
-                               help="Do not update pre-processed headers for Boost.MPL Map.")
-    cmdlineParser.add_argument("--num-elements", dest='numElements', metavar="<num-elements>",
-                               type=to_positive_multiple_of_10, default=100,
-                               help="The maximal number of elements per container sequence. (Default=100)")
-    cmdlineParser.add_argument(dest='sourceDir', metavar="<source-dir>", default=current_boost_dir(), nargs='?',
-                               type=to_existing_absolute_path,
-                               help="The source-directory of Boost. (Default=\"" + sourceDir + "\")")
-    args = cmdlineParser.parse_args()
-
-    # Some verbose debug output.
-    if args.verbose:
-        print "Arguments extracted from command-line:"
-        print "  verbose          = ", args.verbose
-        print "  source directory = ", args.sourceDir
-        print "  num elements     = ", args.numElements
-        print "  sequence type    = ", args.seqType
-        print "  want: vector     = ", args.want_vector
-        print "  want: list       = ", args.want_list
-        print "  want: set        = ", args.want_set
-        print "  want: map        = ", args.want_map
-
-    # Verify that we received any source-directory.
-    if args.sourceDir == None:
-        print "You should specify a valid path to the Boost source-directory."
-        sys.exit(0)
-
-    # The directories for header- and source files of Boost.MPL.
-    # NOTE: Assuming 'args.sourceDir' is the source-directory of the entire boost project.
-    headerDir = os.path.join( args.sourceDir, "boost", "mpl" )
-    sourceDir = os.path.join( args.sourceDir, "libs", "mpl", "preprocessed" )
-    # Check that the header/source-directories exist.
-    if not os.path.exists( headerDir ) or not os.path.exists( sourceDir ):
-        # Maybe 'args.sourceDir' is not the source-directory of the entire boost project
-        # but instead of the Boost.MPL git-directory, only?
-        headerDir = os.path.join( args.sourceDir, "include", "boost", "mpl" )
-        sourceDir = os.path.join( args.sourceDir, "preprocessed" )
-        if not os.path.exists( headerDir ) or not os.path.exists( sourceDir ):
-            cmdlineParser.print_usage()
-            print "error: Cannot find Boost.MPL header/source files in given Boost source-directory!"
-            sys.exit(0)
-
-    # Some verbose debug output.
-    if args.verbose:
-        print "Chosen header-directory: ", headerDir
-        print "Chosen source-directory: ", sourceDir
-
-    # Create list of containers for which files shall be pre-processed.
-    containers = []
-    if args.want_vector:
-        containers.append('vector')
-    if args.want_list:
-        containers.append('list')
-    if args.want_set:
-        containers.append('set')
-    if args.want_map:
-        containers.append('map')
-    if containers == []:
-        print "Nothing to do."
-        print "(Why did you prevent generating pre-processed headers for all Boost.MPL container types?)"
-        sys.exit(0)
-
-    # Possibly fix the header-comments of input-files needed for pre-processing.
-    if args.verbose:
-        print "Checking if prior to pre-processing some input-files need fixing."
-    needFixing = fixmpl.check_input_files(headerDir, sourceDir, containers, args.seqType, args.verbose)
-    if needFixing:
-        if args.verbose:
-            print "Fixing of some input-files prior to pre-processing is needed."
-            print "Will fix them now!"
-        fixmpl.fix_input_files(headerDir, sourceDir, containers, args.seqType, args.verbose)
-
-    # Some verbose debug output.
-    if args.verbose:
-        print "Containers for which to pre-process headers: ", containers
-
-    # Create (additional) input files for generating pre-processed headers of numbered sequence MPL containers.
-    if args.seqType == "both" or args.seqType == "numbered":
-        create_input_for_numbered_sequences(headerDir, sourceDir, containers, args.numElements)
-    # Modify settings for generating pre-processed headers of variadic sequence MPL containers.
-    if args.seqType == "both" or args.seqType == "variadic":
-        adjust_container_limits_for_variadic_sequences(headerDir, containers, args.numElements)
-
-    # Generate MPL-preprocessed files.
-    os.chdir( sourceDir )
-    if args.seqType == "both" or args.seqType == "numbered":
-        if args.want_vector:
-            if args.verbose:
-                print "Pre-process headers for Boost.MPL numbered vectors."
-            os.system( "python " + os.path.join( sourceDir, "preprocess_vector.py" ) + " all " + args.sourceDir )
-        if args.want_list:
-            if args.verbose:
-                print "Pre-process headers for Boost.MPL numbered lists."
-            os.system( "python " + os.path.join( sourceDir, "preprocess_list.py" ) + " all " + args.sourceDir )
-        if args.want_set:
-            if args.verbose:
-                print "Pre-process headers for Boost.MPL numbered sets."
-            os.system( "python " + os.path.join( sourceDir, "preprocess_set.py" ) + " all " + args.sourceDir )
-        if args.want_map:
-            if args.verbose:
-                print "Pre-process headers for Boost.MPL numbered maps."
-            os.system( "python " + os.path.join( sourceDir, "preprocess_map.py" ) + " all " + args.sourceDir )
-    if args.seqType == "both" or args.seqType == "variadic":
-        if args.verbose:
-            print "Pre-process headers for Boost.MPL variadic containers."
-        os.system( "python " + os.path.join( sourceDir, "preprocess.py" ) + " all " + args.sourceDir )
-
-
-if __name__ == '__main__':
-    main()

preprocessed/fix_boost_mpl_preprocess.py

@@ -1,205 +0,0 @@
-# Copyright Deniz Bahadir 2015
-#
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http://www.boost.org/LICENSE_1_0.txt)
-#
-# See http://www.boost.org/libs/mpl for documentation.
-# See http://stackoverflow.com/a/29627158/3115457 for further information.
-
-import argparse
-import sys
-import os.path
-import re
-import fileinput
-import datetime
-import glob
-
-
-def check_header_comment(filename):
-    """Checks if the header-comment of the given file needs fixing."""
-    # Check input file.
-    name = os.path.basename( filename )
-    # Read content of input file.
-    sourcefile = open( filename, "rU" )
-    content = sourcefile.read()
-    sourcefile.close()
-    # Search content for '$Id$'.
-    match = re.search(r'\$Id\$', content)
-    if match == None:
-        # Make sure that the correct value for '$Id$' was already set.
-        match = re.search(r'\$Id: ' + name + r'\s+[^$]+\$', content)
-        if match != None:
-            # The given file needs no fixing.
-            return False
-    # The given file needs fixing.
-    return True
-
-
-def check_input_files_for_variadic_seq(headerDir, sourceDir):
-    """Checks if files, used as input when pre-processing MPL-containers in their variadic form, need fixing."""
-    # Check input files in include/source-directories.
-    files  = glob.glob( os.path.join( headerDir, "*.hpp" ) )
-    files += glob.glob( os.path.join( headerDir, "aux_", "*.hpp" ) )
-    files += glob.glob( os.path.join( sourceDir, "src", "*" ) )
-    for currentFile in sorted( files ):
-        if check_header_comment( currentFile ):
-            return True
-    return False
-
-
-def check_input_files_for_numbered_seq(sourceDir, suffix, containers):
-    """Check if files, used as input when pre-processing MPL-containers in their numbered form, need fixing."""
-    # Check input files for each MPL-container type.
-    for container in containers:
-        files = glob.glob( os.path.join( sourceDir, container, container + '*' + suffix ) )
-        for currentFile in sorted( files ):
-            if check_header_comment( currentFile ):
-                return True
-    return False
-
-
-def check_input_files(headerDir, sourceDir, containers=['vector', 'list', 'set', 'map'],
-                      seqType='both', verbose=False):
-    """Checks if source- and header-files, used as input when pre-processing MPL-containers, need fixing."""
-    # Check the input files for containers in their variadic form.
-    result1 = False
-    if seqType == "both" or seqType == "variadic":
-        if verbose:
-            print "Check if input files for pre-processing Boost.MPL variadic containers need fixing."
-        result1 = check_input_files_for_variadic_seq(headerDir, sourceDir)
-        if verbose:
-            if result1:
-                print "  At least one input file needs fixing!"
-            else:
-                print "  No input file needs fixing!"
-    # Check the input files for containers in their numbered form.
-    result2 = False
-    result3 = False
-    if seqType == "both" or seqType == "numbered":
-        if verbose:
-            print "Check input files for pre-processing Boost.MPL numbered containers."
-        result2 = check_input_files_for_numbered_seq(headerDir, ".hpp", containers)
-        result3 = check_input_files_for_numbered_seq(sourceDir, ".cpp", containers)
-        if verbose:
-            if result2 or result3:
-                print "  At least one input file needs fixing!"
-            else:
-                print "  No input file needs fixing!"
-    # Return result.
-    return result1 or result2 or result3
-
-def fix_header_comment(filename, timestamp):
-    """Fixes the header-comment of the given file."""
-    # Fix input file.
-    name = os.path.basename( filename )
-    for line in fileinput.input( filename, inplace=1, mode="rU" ):
-        # If header-comment already contains anything for '$Id$', remove it.
-        line = re.sub(r'\$Id:[^$]+\$', r'$Id$', line.rstrip())
-        # Replace '$Id$' by a string containing the file's name (and a timestamp)!
-        line = re.sub(re.escape(r'$Id$'), r'$Id: ' + name + r' ' + timestamp.isoformat() + r' $', line.rstrip())
-        print(line)
-
-
-def fix_input_files_for_variadic_seq(headerDir, sourceDir, timestamp):
-    """Fixes files used as input when pre-processing MPL-containers in their variadic form."""
-    # Fix files in include/source-directories.
-    files  = glob.glob( os.path.join( headerDir, "*.hpp" ) )
-    files += glob.glob( os.path.join( headerDir, "aux_", "*.hpp" ) )
-    files += glob.glob( os.path.join( sourceDir, "src", "*" ) )
-    for currentFile in sorted( files ):
-        fix_header_comment( currentFile, timestamp )
-
-
-def fix_input_files_for_numbered_seq(sourceDir, suffix, timestamp, containers):
-    """Fixes files used as input when pre-processing MPL-containers in their numbered form."""
-    # Fix input files for each MPL-container type.
-    for container in containers:
-        files = glob.glob( os.path.join( sourceDir, container, container + '*' + suffix ) )
-        for currentFile in sorted( files ):
-            fix_header_comment( currentFile, timestamp )
-
-
-def fix_input_files(headerDir, sourceDir, containers=['vector', 'list', 'set', 'map'],
-                    seqType='both', verbose=False):
-    """Fixes source- and header-files used as input when pre-processing MPL-containers."""
-    # The new modification time.
-    timestamp = datetime.datetime.now();
-    # Fix the input files for containers in their variadic form.
-    if seqType == "both" or seqType == "variadic":
-        if verbose:
-            print "Fix input files for pre-processing Boost.MPL variadic containers."
-        fix_input_files_for_variadic_seq(headerDir, sourceDir, timestamp)
-    # Fix the input files for containers in their numbered form.
-    if seqType == "both" or seqType == "numbered":
-        if verbose:
-            print "Fix input files for pre-processing Boost.MPL numbered containers."
-        fix_input_files_for_numbered_seq(headerDir, ".hpp", timestamp, containers)
-        fix_input_files_for_numbered_seq(sourceDir, ".cpp", timestamp, containers)
-
-
-def to_existing_absolute_path(string):
-    """Converts a path into its absolute path and verifies that it exists or throws an exception."""
-    value = os.path.abspath(string)
-    if not os.path.exists( value ) or not os.path.isdir( value ):
-        msg = '"%r" is not a valid path to a directory.' % string
-        raise argparse.ArgumentTypeError(msg)
-    return value
-
-
-def main():
-    """The main function."""
-
-    # Prepare and run cmdline-parser.
-    cmdlineParser = argparse.ArgumentParser(
-                    description="Fixes the input files used for pre-processing of Boost.MPL headers.")
-    cmdlineParser.add_argument("-v", "--verbose", dest='verbose', action='store_true',
-                               help="Be a little bit more verbose.")
-    cmdlineParser.add_argument("--check-only", dest='checkonly', action='store_true',
-                               help="Only checks if fixing is required.")
-    cmdlineParser.add_argument(dest='sourceDir', metavar="<source-dir>",
-                               type=to_existing_absolute_path,
-                               help="The source-directory of Boost.")
-    args = cmdlineParser.parse_args()
-
-    # Some verbose debug output.
-    if args.verbose:
-        print "Arguments extracted from command-line:"
-        print "  verbose           = ", args.verbose
-        print "  check-only        = ", args.checkonly
-        print "  source directory  = ", args.sourceDir
-
-    # The directories for header- and source files of Boost.MPL.    
-    # NOTE: Assuming 'args.sourceDir' is the source-directory of the entire boost project.
-    headerDir = os.path.join( args.sourceDir, "boost", "mpl" )
-    sourceDir = os.path.join( args.sourceDir, "libs", "mpl", "preprocessed" )
-    # Check that the header/source-directories exist.
-    if not os.path.exists( headerDir ) or not os.path.exists( sourceDir ):
-        # Maybe 'args.sourceDir' is not the source-directory of the entire boost project
-        # but instead of the Boost.MPL git-directory, only?
-        headerDir = os.path.join( args.sourceDir, "include", "boost", "mpl" )
-        sourceDir = os.path.join( args.sourceDir, "preprocessed" )
-        if not os.path.exists( headerDir ) or not os.path.exists( sourceDir ):
-            cmdlineParser.print_usage()
-            print "error: Cannot find Boost.MPL header/source files in given Boost source-directory!"
-            sys.exit(0)
-
-    # Some verbose debug output.
-    if args.verbose:
-        print "Chosen header-directory: ", headerDir
-        print "Chosen source-directory: ", sourceDir
-
-    if args.checkonly:
-        # Check input files for generating pre-processed headers.
-        result = check_input_files(headerDir, sourceDir, verbose = args.verbose)
-        if result:
-            print "Fixing the input-files used for pre-processing of Boost.MPL headers IS required."
-        else:
-            print "Fixing the input-files used for pre-processing of Boost.MPL headers is NOT required."
-    else:
-        # Fix input files for generating pre-processed headers.
-        fix_input_files(headerDir, sourceDir, verbose = args.verbose)
-
-
-if __name__ == '__main__':
-    main()

preprocessed/include/msvc60/user.hpp

@@ -0,0 +1,26 @@
+
+// Copyright Aleksey Gurtovoy 2003-2004
+//
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Id$
+// $Date$
+// $Revision$
+
+#define BOOST_NO_CONFIG
+#define BOOST_MSVC 1200
+#define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+#define BOOST_NO_TEMPLATE_TEMPLATES
+#define BOOST_NO_CV_VOID_SPECIALIZATIONS
+#define BOOST_NO_INTRINSIC_WCHAR_T
+#define BOOST_NO_STD_ALLOCATOR
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_APPLY_TEMPLATE
+#define BOOST_MPL_CFG_MSVC_60_ETI_BUG
+#define BOOST_MPL_CFG_MSVC_ETI_BUG
+#define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC

preprocessed/include/msvc70/user.hpp

@@ -0,0 +1,21 @@
+
+// Copyright Aleksey Gurtovoy 2003-2004
+//
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Id$
+// $Date$
+// $Revision$
+
+#define BOOST_NO_CONFIG
+#define BOOST_MSVC 1300
+#define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
+#define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_APPLY_TEMPLATE
+#define BOOST_MPL_CFG_MSVC_ETI_BUG
+#define BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC

preprocessed/include/no_ctps/user.hpp

@@ -0,0 +1,15 @@
+
+// Copyright Aleksey Gurtovoy 2003-2004
+//
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Id$
+// $Date$
+// $Revision$
+
+#define BOOST_NO_CONFIG
+#define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

preprocessed/preprocess.cmd

@@ -1 +1 @@
-gcc -E -C -P "-I%(boost_root)s" "-D BOOST_USER_CONFIG=\"%(boost_root)s/libs/mpl/preprocessed/include/%(mode)s/user.hpp\"" -D BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES %(file)s >"%(file_path)s"
+gcc -E -C -P "-I%(boost_root)s" "-D BOOST_USER_CONFIG=<%(boost_root)s/libs/mpl/preprocessed/include/%(mode)s/user.hpp>" -D BOOST_MPL_CFG_NO_OWN_PP_PRIMITIVES %(file)s >"%(file_path)s"

preprocessed/preprocess.py

@@ -82,7 +82,7 @@ def main( all_modes, src_dir, dst_dir ):
 if __name__ == '__main__':
     
     main(
-          ["bcc", "bcc551", "gcc", "mwcw", "dmc", "no_ttp", "plain"]
+          ["bcc", "bcc551", "gcc", "msvc60", "msvc70", "mwcw", "dmc", "no_ctps", "no_ttp", "plain"]
         , "src"
         , os.path.join( "boost", "mpl", "aux_", "preprocessed" )
         )

preprocessed/preprocess_map.py

@@ -15,7 +15,7 @@ import preprocess
 import os.path
 
 preprocess.main(
-      [ "plain", "typeof_based" ]
+      [ "plain", "typeof_based", "no_ctps" ]
     , "map"
     , os.path.join( "boost", "mpl", "map", "aux_", "preprocessed" )
     )

preprocessed/preprocess_vector.py

@@ -15,7 +15,7 @@ import preprocess
 import os.path
 
 preprocess.main(
-      [ "plain", "typeof_based" ]
+      [ "no_ctps", "plain", "typeof_based" ]
     , "vector"
     , os.path.join( "boost", "mpl", "vector", "aux_", "preprocessed" )
     )

test/Jamfile.v2

@@ -1,5 +1,4 @@
 
-compile aux_/increased_arity.cpp ;
 compile aux_/largest_int.cpp ;
 compile aux_/msvc_is_class.cpp ;
 compile aux_/template_arity.cpp ;
@@ -13,7 +12,6 @@ compile apply_wrap.cpp ;
 compile arithmetic.cpp ;
 compile as_sequence.cpp ;
 compile assert.cpp ;
-# link assert_vc8_p1.cpp assert_vc8_p2.cpp ;
 compile at.cpp ;
 compile back.cpp ;
 compile bind.cpp ;
@@ -38,7 +36,6 @@ compile find_if.cpp ;
 compile fold.cpp ;
 run for_each.cpp ;
 compile front.cpp ;
-compile get_tag_def.cpp ;
 compile has_xxx.cpp ;
 compile identity.cpp ;
 compile if.cpp ;

test/always.cpp

@@ -1,8 +1,8 @@
 
 // Copyright Aleksey Gurtovoy 2000-2004
 //
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 // See http://www.boost.org/libs/mpl for documentation.
@@ -22,8 +22,6 @@ MPL_TEST_CASE()
 {
     typedef always<true_> always_true;
 
-    MPL_ASSERT(( apply< always_true > ));
-    MPL_ASSERT(( apply0< always_true > ));
     MPL_ASSERT(( apply1< always_true,false_ > ));
     MPL_ASSERT(( apply2< always_true,false_,false_ > ));
     MPL_ASSERT(( apply3< always_true,false_,false_,false_ > ));
@@ -32,16 +30,12 @@ MPL_TEST_CASE()
 
 MPL_TEST_CASE()
 {
-    typedef always< int_<10> > always_10;
+    typedef always< int_<10> > always_10;    
 
-    typedef apply< always_10 >::type res;
-    typedef apply0< always_10 >::type res0;
     typedef apply1< always_10,int_<0> >::type res1;
     typedef apply2< always_10,int_<0>,int_<0> >::type res2;
     typedef apply3< always_10,int_<0>,int_<0>,int_<0> >::type res3;
 
-    MPL_ASSERT_RELATION( res::value, ==, 10 );
-    MPL_ASSERT_RELATION( res0::value, ==, 10 );
     MPL_ASSERT_RELATION( res1::value, ==, 10 );
     MPL_ASSERT_RELATION( res2::value, ==, 10 );
     MPL_ASSERT_RELATION( res3::value, ==, 10 );

test/apply.cpp

@@ -76,7 +76,7 @@ MPL_TEST_CASE()
 
     typedef apply1< _1, std_vector<_1> >::type v_lambda;
     typedef apply1<v_lambda,int>::type v_int;
-    MPL_ASSERT(( is_same< v_int,std_vector<int> > ));
+    MPL_ASSERT(( is_same< v,std_vector<int> > ));
 }
 
 MPL_TEST_CASE()
@@ -86,7 +86,7 @@ MPL_TEST_CASE()
 
     typedef apply1< lambda<_1>, std_vector<_1> >::type make_vector;
     typedef apply_wrap1< make_vector,int >::type v_int;
-    MPL_ASSERT(( is_same< v_int,std_vector<int> > ));
+    MPL_ASSERT(( is_same< v,std_vector<int> > ));
 }
 
 MPL_TEST_CASE()

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(z_ignored,i) \
+#   define APPLY_0_FUNC_DEF(i) \
     struct f0 \
     { \
         template< typename T = int > struct apply { typedef char type; }; \
     }; \
 /**/
 #else
-#   define APPLY_0_FUNC_DEF(z_ignored,i) \
+#   define APPLY_0_FUNC_DEF(i) \
     struct f0 \
     { \
         template< typename T > struct apply { typedef char type; }; \
@@ -39,16 +39,16 @@
 /**/
 #endif
 
-#define APPLY_N_FUNC_DEF(z,i) \
+#define APPLY_N_FUNC_DEF(i) \
     struct first##i \
     { \
-        template< BOOST_MPL_PP_PARAMS_Z(z, i, typename U) > \
+        template< BOOST_MPL_PP_PARAMS(i, typename U) > \
         struct apply { typedef U1 type; }; \
     }; \
     \
     struct last##i \
     { \
-        template< BOOST_MPL_PP_PARAMS_Z(z, i, typename U) > \
+        template< BOOST_MPL_PP_PARAMS(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 \
-        )(z,i) \
+        )(i) \
 /**/
 
 namespace { namespace test {
@@ -73,22 +73,22 @@ struct g0 { struct apply { typedef char type; }; };
 
 }}
 
-#define APPLY_0_TEST(z_ignored, i, apply_) \
+#define APPLY_0_TEST(i, apply_) \
     typedef apply_<test::f##i>::type t; \
     { MPL_ASSERT(( boost::is_same<t, char> )); } \
 /**/
 
-#define APPLY_N_TEST(z, i, apply_) \
+#define APPLY_N_TEST(i, apply_) \
     typedef apply_< \
           test::first##i \
         , char \
         BOOST_PP_COMMA_IF(BOOST_PP_DEC(i)) \
-        BOOST_MPL_PP_ENUM_Z(z, BOOST_PP_DEC(i), int) \
+        BOOST_MPL_PP_ENUM(BOOST_PP_DEC(i), int) \
         >::type t1##i; \
     \
     typedef apply_< \
           test::last##i \
-        , BOOST_MPL_PP_ENUM_Z(z, BOOST_PP_DEC(i), int) \
+        , BOOST_MPL_PP_ENUM(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 \
-        )(z, i, BOOST_PP_CAT(apply_wrap,i)) \
+        )(i, BOOST_PP_CAT(apply_wrap,i)) \
 /**/
 
 

test/assert.cpp

@@ -71,17 +71,6 @@ struct her
     }
 };
 
-template<class T>
-struct nested : boost::mpl::true_ {
-    BOOST_MPL_ASSERT(( boost::is_pointer<T*> ));
-    BOOST_MPL_ASSERT_NOT(( boost::is_same<void,T> ));
-    BOOST_MPL_ASSERT_RELATION( sizeof(T*), >, 1 );
-    BOOST_MPL_ASSERT_MSG( true, GLOBAL_SCOPE_ERROR, (int,long) );
-};
-
-BOOST_MPL_ASSERT(( nested<int> ));
-BOOST_MPL_ASSERT_NOT(( boost::mpl::not_<nested<unsigned> > ));
-
 int main()
 {
     her<void> h;