Remove static (#90)

* fixed libraries include
  * fixed incorrect usage of python2 string
  * fixed python2 to python3 script issues (2to3) like print ""
  * fixed data types
  * fixed python3 usage of str instead of string (join, split etc.)
  * added support to determine the absolute path of the executable
    binary of the current Python interpreter
    * thx @Bagira80 for his support

Fixes issue: #67

Signed-off-by: Thomas Höhlig <thoehlig@benocs.com>

.appveyor.yml

@@ -33,6 +33,12 @@ branches:
     - /fix\/.*/
     - /pr\/.*/
 
+skip_commits:
+  files:
+    - LICENSE
+    - meta/*
+    - README.md
+
 matrix:
   fast_finish: false
   # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
@@ -64,16 +70,6 @@ environment:
       B2_CXXSTD: 14,17
       B2_TOOLSET: msvc-14.1
 
-    - FLAVOR: clang-cl
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: 64
-      B2_CXXSTD: 11,14,17
-      B2_TOOLSET: clang-win
-
-    - FLAVOR: Visual Studio 2015, 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-12.0,msvc-14.0
-
     - FLAVOR: cygwin (32-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ADDPATH: C:\cygwin\bin;
@@ -88,20 +84,6 @@ environment:
       B2_CXXSTD: 03,11,14,1z
       B2_TOOLSET: gcc
 
-    - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_ADDRESS_MODEL: 32
-      ADDPATH: C:\mingw\bin;
-      B2_CXXSTD: 03,11,14,1z
-      B2_TOOLSET: gcc
-
-    - FLAVOR: mingw64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
-      B2_ADDRESS_MODEL: 64
-      B2_CXXSTD: 03,11,14,17,2a
-      B2_TOOLSET: gcc
-
 install:
   - git clone --depth 1 https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
   # Copy ci folder if not testing Boost.CI

.github/workflows/ci.yml

@@ -1,12 +1,20 @@
+#
 # Copyright 2020-2021 Peter Dimov
 # Copyright 2021 Andrey Semashev
-# Copyright 2021 Alexander Grund
+# Copyright 2021-2024 Alexander Grund
-# Copyright 2022 James E. King III
+# Copyright 2022-2025 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)
+#
+# This workflow uses the Boost.CI reusable workflow which builds a variety of
+# configurations of your project, runs tests, and generates code coverage reports.
+#
+# To use it, copy this file into your repository as `.github/workflows/ci.yml` and
+# customize it appropriately.
+# 
 ---
-name: CI
+name: Boost.CI
 
 on:
   pull_request:
@@ -18,322 +26,16 @@ on:
       - feature/**
       - fix/**
       - pr/**
-
+    paths-ignore:
-concurrency:
+      - LICENSE
-  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+      - meta/**
-  cancel-in-progress: true
+      - README.md
-
-env:
-  ASAN_OPTIONS: allocator_may_return_null=1
-  GIT_FETCH_JOBS: 8
-  NET_RETRY_COUNT: 5
-  B2_CI_VERSION: 1
-  B2_VARIANT: debug,release
-  B2_LINK: shared,static
-  LCOV_BRANCH_COVERAGE: 0
-  CODECOV_NAME: Github Actions
 
 jobs:
-  posix:
+  call-boost-ci:
-    defaults:
+    name: Run Boost.CI
-      run:
+    uses: boostorg/boost-ci/.github/workflows/reusable.yml@master
-        shell: bash
+    secrets:
-
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    strategy:
+      COVERITY_SCAN_NOTIFICATION_EMAIL: ${{ secrets.COVERITY_SCAN_NOTIFICATION_EMAIL }}
-      fail-fast: false
+      COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-      matrix:
-        include:
-          # Linux, gcc
-          - { compiler: gcc-4.4,   cxxstd: '98,0x',          os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: gcc-4.6,   cxxstd: '03,0x',          os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: gcc-4.7,   cxxstd: '03,11',          os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: gcc-4.8,   cxxstd: '03,11',          os: ubuntu-18.04 }
-          - { compiler: gcc-4.9,   cxxstd: '03,11',          os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: gcc-5,     cxxstd: '03,11,14,1z',    os: ubuntu-18.04 }
-          - { compiler: gcc-6,     cxxstd: '03,11,14,17',    os: ubuntu-18.04 }
-          - { compiler: gcc-7,     cxxstd: '03,11,14,17',    os: ubuntu-18.04 }
-          - { compiler: gcc-8,     cxxstd: '03,11,14,17,2a', os: ubuntu-18.04 }
-          - { compiler: gcc-9,     cxxstd: '03,11,14,17,2a', os: ubuntu-18.04 }
-          - { compiler: gcc-10,    cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { compiler: gcc-11,    cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { name: GCC w/ sanitizers, sanitize: yes,
-              compiler: gcc-11,    cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { name: Collect coverage, coverage: yes,
-              compiler: gcc-10,    cxxstd: '03,11',          os: ubuntu-20.04, install: 'g++-10-multilib', address-model: '32,64' }
-
-          # Linux, clang
-          - { compiler: clang-3.5, cxxstd: '03,11',          os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: clang-3.6, cxxstd: '03,11,14',       os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: clang-3.7, cxxstd: '03,11,14',       os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: clang-3.8, cxxstd: '03,11,14',       os: ubuntu-20.04, container: 'ubuntu:16.04' }
-          - { compiler: clang-3.9, cxxstd: '03,11,14',       os: ubuntu-18.04 }
-          - { compiler: clang-4.0, cxxstd: '03,11,14',       os: ubuntu-18.04 }
-          - { compiler: clang-5.0, cxxstd: '03,11,14,1z',    os: ubuntu-18.04 }
-          - { compiler: clang-6.0, cxxstd: '03,11,14,17',    os: ubuntu-18.04 }
-          - { compiler: clang-7,   cxxstd: '03,11,14,17',    os: ubuntu-18.04 }
-          # Note: clang-8 does not fully support C++20, so it is not compatible with some libstdc++ versions in this mode
-          - { compiler: clang-8,   cxxstd: '03,11,14,17,2a', os: ubuntu-18.04, install: 'clang-8 g++-7', gcc_toolchain: 7 }
-          - { compiler: clang-9,   cxxstd: '03,11,14,17,2a', os: ubuntu-20.04 }
-          - { compiler: clang-10,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { compiler: clang-11,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04 }
-          - { name: Clang w/ valgrind, valgrind: yes,
-              compiler: clang-12,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04, install: 'valgrind' }
-
-          # libc++
-          - { compiler: clang-6.0, cxxstd: '03,11,14',       os: ubuntu-18.04, stdlib: libc++, install: 'clang-6.0 libc++-dev libc++abi-dev' }
-          - { name: Clang w/ sanitizers, sanitize: yes,
-              compiler: clang-12,  cxxstd: '03,11,14,17,20', os: ubuntu-20.04, stdlib: libc++, install: 'clang-12 libc++-12-dev libc++abi-12-dev' }
-
-          # OSX, clang
-          - { compiler: clang,     cxxstd: '03,11,14,17,2a', os: macos-10.15 }
-
-          # Coverity Scan
-          # requires two github secrets in repo to activate; see ci/github/coverity.sh
-          # does not run on pull requests, only on pushes into develop and master
-          - { name: Coverity, coverity: yes,
-              compiler: clang-10,  cxxstd: '17',             os: ubuntu-20.04, ccache: no }
-
-          # multiarch (bigendian testing) - does not support coverage yet
-          # Please uncomment when fixing https://github.com/boostorg/mpl/issues/50
-          # - { name: Big-endian, multiarch: yes,
-          #     compiler: clang,     cxxstd: '17',             os: ubuntu-20.04, ccache: no, distro: fedora, edition: 34, arch: s390x }
-
-
-    timeout-minutes: 120
-    runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
-    env: {B2_USE_CCACHE: 1}
-
-    steps:
-      - name: Setup environment
-        run: |
-            if [ -f "/etc/debian_version" ]; then
-                echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
-                export DEBIAN_FRONTEND=noninteractive
-            fi
-            if [ -n "${{matrix.container}}" ] && [ -f "/etc/debian_version" ]; then
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common
-                # Need (newer) git
-                for i in {1..${NET_RETRY_COUNT:-3}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-                apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ python libpython-dev git
-            fi
-            # multiple job types are not compatible with ccache, they use "ccache: no" in the matrix
-            if [[ "${{ matrix.ccache }}" == "no" ]]; then
-                echo "B2_USE_CCACHE=0" >> $GITHUB_ENV
-            fi
-            if [[ "${{ matrix.valgrind }}" == "yes" ]]; then
-                echo "B2_DEFINES=BOOST_NO_STRESS_TEST=1" >> $GITHUB_ENV
-                echo "B2_TESTFLAGS=testing.launcher=valgrind" >> $GITHUB_ENV
-                echo "B2_FLAGS=define=BOOST_USE_VALGRIND=1" >> $GITHUB_ENV
-                echo "VALGRIND_OPTS=--error-exitcode=1" >> $GITHUB_ENV
-            fi
-            git config --global pack.threads 0
-
-      - uses: actions/checkout@v3
-        with:
-          # For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary'
-          fetch-depth: ${{ matrix.coverage && '0' || '1' }}
-
-      - name: Cache ccache
-        uses: actions/cache@v3
-        if: env.B2_USE_CCACHE
-        with:
-          path: ~/.ccache
-          key: ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}-${{github.sha}}
-          restore-keys: |
-            ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}-
-            ${{matrix.os}}-${{matrix.container}}-${{matrix.compiler}}
-
-      - name: Fetch Boost.CI
-        uses: actions/checkout@v3
-        with:
-          repository: boostorg/boost-ci
-          ref: master
-          path: boost-ci-cloned
-
-      - name: Get CI scripts folder
-        run: |
-            # Copy ci folder if not testing Boost.CI
-            [[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
-            rm -rf boost-ci-cloned
-
-      - name: Install packages
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-            SOURCE_KEYS=(${{join(matrix.source_keys, ' ')}})
-            SOURCES=(${{join(matrix.sources, ' ')}})
-            # Add this by default
-            SOURCES+=(ppa:ubuntu-toolchain-r/test)
-            for key in "${SOURCE_KEYS[@]}"; do
-                for i in {1..$NET_RETRY_COUNT}; do
-                    wget -O - "$key" | sudo apt-key add - && break || sleep 10
-                done
-            done
-            for source in "${SOURCES[@]}"; do
-                for i in {1..$NET_RETRY_COUNT}; do
-                    sudo add-apt-repository $source && break || sleep 10
-                done
-            done
-            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
-            if [[ -z "${{matrix.install}}" ]]; then
-                pkgs="${{matrix.compiler}}"
-                pkgs="${pkgs/gcc-/g++-}"
-            else
-                pkgs="${{matrix.install}}"
-            fi
-            sudo apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y $pkgs
-
-      - name: Setup GCC Toolchain
-        if: matrix.gcc_toolchain
-        run: |
-            GCC_TOOLCHAIN_ROOT="$HOME/gcc-toolchain"
-            echo "GCC_TOOLCHAIN_ROOT=$GCC_TOOLCHAIN_ROOT" >> $GITHUB_ENV
-            MULTIARCH_TRIPLET="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-            mkdir -p "$GCC_TOOLCHAIN_ROOT"
-            ln -s /usr/include "$GCC_TOOLCHAIN_ROOT/include"
-            ln -s /usr/bin "$GCC_TOOLCHAIN_ROOT/bin"
-            mkdir -p "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET"
-            ln -s "/usr/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}" "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET/${{matrix.gcc_toolchain}}"
-
-      - name: Setup multiarch
-        if: matrix.multiarch
-        run: |
-          sudo apt-get install --no-install-recommends -y binfmt-support qemu-user-static
-          sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          git clone https://github.com/jeking3/bdde.git
-          echo "$(pwd)/bdde/bin/linux" >> ${GITHUB_PATH}
-          echo "BDDE_DISTRO=${{ matrix.distro }}" >> ${GITHUB_ENV}
-          echo "BDDE_EDITION=${{ matrix.edition }}" >> ${GITHUB_ENV}
-          echo "BDDE_ARCH=${{ matrix.arch }}" >> ${GITHUB_ENV}
-          echo "B2_DEFINES=BOOST_NO_STRESS_TEST=1" >> ${GITHUB_ENV}
-          echo "B2_WRAPPER=bdde" >> ${GITHUB_ENV}
-
-      - name: Setup Boost
-        env:
-          B2_ADDRESS_MODEL: ${{matrix.address-model}}
-          B2_COMPILER: ${{matrix.compiler}}
-          B2_CXXSTD: ${{matrix.cxxstd}}
-          B2_SANITIZE: ${{matrix.sanitize}}
-          B2_STDLIB: ${{matrix.stdlib}}
-        run: source ci/github/install.sh
-
-      - name: Setup coverage collection
-        if: matrix.coverage
-        run: ci/github/codecov.sh "setup"
-
-      - name: Run tests
-        if: '!matrix.coverity'
-        run: ci/build.sh
-
-      - name: Upload coverage
-        if: matrix.coverage
-        run: ci/codecov.sh "upload"
-
-      - name: Run coverity
-        if: matrix.coverity && github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name == 'master')
-        run: ci/github/coverity.sh
-        env:
-          COVERITY_SCAN_NOTIFICATION_EMAIL: ${{ secrets.COVERITY_SCAN_NOTIFICATION_EMAIL }}
-          COVERITY_SCAN_TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-
-  windows:
-    defaults:
-      run:
-        shell: cmd
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { toolset: msvc-14.2, cxxstd: '14,17,20',       addrmd: '32,64', os: windows-2019 }
-          - { name: Collect coverage, coverage: yes,
-              toolset: msvc-14.3, cxxstd: '14,17,20',       addrmd: '32,64', os: windows-2022 }
-          - { toolset: gcc,       cxxstd: '03,11,14,17,2a', addrmd: '64',    os: windows-2019 }
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Fetch Boost.CI
-        uses: actions/checkout@v2
-        with:
-          repository: boostorg/boost-ci
-          ref: master
-          path: boost-ci-cloned
-      - name: Get CI scripts folder
-        run: |
-            REM Copy ci folder if not testing Boost.CI
-            if "%GITHUB_REPOSITORY%" == "%GITHUB_REPOSITORY:boost-ci=%" xcopy /s /e /q /i /y boost-ci-cloned\ci .\ci
-            rmdir /s /q boost-ci-cloned
-
-      - name: Setup Boost
-        run: ci\github\install.bat
-
-      - name: Run tests
-        if: '!matrix.coverage'
-        run: ci\build.bat
-        env:
-          B2_TOOLSET: ${{matrix.toolset}}
-          B2_CXXSTD: ${{matrix.cxxstd}}
-          B2_ADDRESS_MODEL: ${{matrix.addrmd}}
-
-      - name: Collect coverage
-        shell: powershell
-        if: matrix.coverage
-        run: ci\opencppcoverage.ps1
-        env:
-          B2_TOOLSET: ${{matrix.toolset}}
-          B2_CXXSTD: ${{matrix.cxxstd}}
-          B2_ADDRESS_MODEL: ${{matrix.addrmd}}
-
-      - name: Upload coverage
-        if: matrix.coverage
-        uses: codecov/codecov-action@v2
-        with:
-          files: __out/cobertura.xml
-
-  CMake:
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { os: ubuntu-20.04, build_shared: ON,  build_type: Release, generator: 'Unix Makefiles' }
-          - { os: ubuntu-20.04, build_shared: OFF, build_type: Debug, generator: 'Unix Makefiles' }
-          - { os: windows-2019, build_shared: ON,  build_type: Release, generator: 'Visual Studio 16 2019' }
-          - { os: windows-2019, build_shared: OFF, build_type: Debug, generator: 'Visual Studio 16 2019' }
-
-    timeout-minutes: 120
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Fetch Boost.CI
-        uses: actions/checkout@v2
-        with:
-          repository: boostorg/boost-ci
-          ref: master
-          path: boost-ci-cloned
-
-      - name: Get CI scripts folder
-        run: |
-            # Copy ci folder if not testing Boost.CI
-            [[ "$GITHUB_REPOSITORY" =~ "boost-ci" ]] || cp -r boost-ci-cloned/ci .
-            rm -rf boost-ci-cloned
-
-      - name: Setup Boost
-        env: {B2_DONT_BOOTSTRAP: 1}
-        run: source ci/github/install.sh
-
-      - name: Run CMake
-        run: |
-            cd "$BOOST_ROOT"
-            mkdir __build_cmake_test__ && cd __build_cmake_test__
-            cmake -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=${{matrix.build_shared}} -DBUILD_TESTING=ON -DBoost_VERBOSE=ON ..
-            cmake --build . --config ${{matrix.build_type}}

CMakeLists.txt

@@ -1,22 +1,30 @@
-# Copyright 2018 Mike Dev
+# Generated by `boostdep --cmake mpl`
+# Copyright 2020, 2021 Peter Dimov
 # 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
+# https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required( VERSION 3.5...3.20 )
+cmake_minimum_required(VERSION 3.5...3.20)
-project( boost_mpl VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
 
-add_library( boost_mpl INTERFACE )
+project(boost_mpl VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
-add_library( Boost::mpl ALIAS boost_mpl )
 
-target_include_directories( boost_mpl INTERFACE include )
+add_library(boost_mpl INTERFACE)
+add_library(Boost::mpl ALIAS boost_mpl)
 
-target_link_libraries( boost_mpl
+target_include_directories(boost_mpl INTERFACE include)
-    INTERFACE
+
-        Boost::config
+target_link_libraries(boost_mpl
-        Boost::core
+  INTERFACE
-        Boost::predef
+    Boost::config
-        Boost::preprocessor
+    Boost::core
-        Boost::static_assert
+    Boost::predef
-        Boost::type_traits
+    Boost::preprocessor
-        Boost::utility
+    Boost::static_assert
+    Boost::type_traits
+    Boost::utility
 )
+
+if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
+
+  add_subdirectory(test)
+
+endif()

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 ;

README.md

@@ -1,8 +1,8 @@
-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.
+MPL, part of collection of the [Boost C++ Libraries](https://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).
+Distributed under the [Boost Software License, Version 1.0](https://www.boost.org/LICENSE_1_0.txt).
 
 ### Properties
 
@@ -11,10 +11,11 @@ Distributed under the [Boost Software License, Version 1.0](http://www.boost.org
 
 ### Build Status
 
-Branch          | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
+<!-- boost-ci/tools/makebadges.sh --project mpl --appveyor 49kygihpsvv2sps0 --codecov 31bBblRchG --coverity 15866 -->
-:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
+| Branch          | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
-[`master`](https://github.com/boostorg/mpl/tree/master) | [![Build Status](https://github.com/boostorg/mpl/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/mpl/actions?query=branch:master) | [![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)](https://www.boost.org/doc/libs/master/libs/mpl/doc/index.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://github.com/boostorg/mpl/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/mpl/actions?query=branch:develop) | [![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)](https://www.boost.org/doc/libs/develop/libs/mpl/doc/index.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/mpl.html)
+| [`master`](https://github.com/boostorg/mpl/tree/master) | [![Build Status](https://github.com/boostorg/mpl/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/mpl/actions?query=branch:master) | [![Build status](https://ci.appveyor.com/api/projects/status/49kygihpsvv2sps0/branch/master?svg=true)](https://ci.appveyor.com/project/cppalliance/mpl/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?token=31bBblRchG)](https://codecov.io/gh/boostorg/mpl/tree/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)](https://www.boost.org/doc/libs/master/libs/mpl) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://www.boost.org/development/tests/master/developer/mpl.html)
+| [`develop`](https://github.com/boostorg/mpl/tree/develop) | [![Build Status](https://github.com/boostorg/mpl/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/mpl/actions?query=branch:develop) | [![Build status](https://ci.appveyor.com/api/projects/status/49kygihpsvv2sps0/branch/develop?svg=true)](https://ci.appveyor.com/project/cppalliance/mpl/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?token=31bBblRchG)](https://codecov.io/gh/boostorg/mpl/tree/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)](https://www.boost.org/doc/libs/develop/libs/mpl) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://www.boost.org/development/tests/develop/developer/mpl.html)
 
 ### Directories
 
@@ -27,8 +28,8 @@ Branch          | GHA CI | Appveyor | Coverity Scan | codecov.io | Deps | Docs |
 
 ### More information
 
-* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-mpl)
+* [Ask questions](https://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).
+* 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](https://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.
+* Discussions about the library are held on the [Boost developers mailing list](https://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](https://www.boost.org/community/policy.html) before posting and add the `[mpl]` tag at the beginning of the subject line.
 

build.jam

@@ -0,0 +1,29 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/predef//boost_predef
+    /boost/preprocessor//boost_preprocessor
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits
+    /boost/utility//boost_utility ;
+
+project /boost/mpl
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_mpl : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_mpl example test ]
+    ;
+
+call-if : boost-library mpl
+    ;
+

example/Jamfile.v2

@@ -7,9 +7,11 @@
 
 import testing ;
 
+project : requirements <library>/boost/mpl//boost_mpl ;
+
 test-suite "mpl-examples"
    :    [ run     inherit_linearly.cpp ]
         [ compile integer.cpp ]
-        [ run     tuple_from_list.cpp ]
+        [ run     tuple_from_list.cpp : : : <library>/boost/tuple//boost_tuple ]
    ;
 

include/boost/mpl/and.hpp

@@ -28,26 +28,22 @@
 // '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)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
+#if defined(and)
-#if defined(and) 
 #   pragma push_macro("and")
 #   undef and
 #   define and(x)
 #endif
 #endif
-#endif
 
 #   define BOOST_MPL_PREPROCESSED_HEADER and.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
+#if defined(and)
-#if defined(and) 
 #   pragma pop_macro("and")
 #endif
 #endif
-#endif
 
 #else
 

include/boost/mpl/aux_/integral_wrapper.hpp

@@ -56,7 +56,8 @@ struct AUX_WRAPPER_NAME
 // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
 // while some other don't like 'value + 1' (Borland), and some don't like
 // either
-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) \
+    || __cplusplus >= 201103L
  private:
     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));

include/boost/mpl/aux_/na_assert.hpp

@@ -22,7 +22,7 @@
     && !BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
 #   include <boost/mpl/assert.hpp>
 #   define BOOST_MPL_AUX_ASSERT_NOT_NA(x) \
-    BOOST_MPL_ASSERT_NOT((boost::mpl::is_na<type>)) \
+    BOOST_MPL_ASSERT_NOT((boost::mpl::is_na<x>)) \
 /**/
 #else
 #   include <boost/static_assert.hpp>

include/boost/mpl/aux_/ptr_to_ref.hpp

@@ -39,7 +39,7 @@
 
 namespace boost { namespace mpl { namespace aux {
 
-template< typename T > static T const& ptr_to_ref(T*);
+template< typename T > T const& ptr_to_ref(T*);
 
 }}}
 

include/boost/mpl/bitand.hpp

@@ -19,27 +19,23 @@
 // 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)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(bitand)
 #   pragma push_macro("bitand")
 #   undef bitand
 #   define bitand(x)
 #endif
 #endif
-#endif
 
 #define AUX778076_OP_NAME   bitand_
 #define AUX778076_OP_PREFIX bitand
 #define AUX778076_OP_TOKEN  &
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(bitand)
 #   pragma pop_macro("bitand")
 #endif
 #endif
-#endif
 
 #endif // BOOST_MPL_BITAND_HPP_INCLUDED

include/boost/mpl/bitor.hpp

@@ -19,27 +19,23 @@
 // 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)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(bitor)
 #   pragma push_macro("bitor")
 #   undef bitor
 #   define bitor(x)
 #endif
 #endif
-#endif
 
 #define AUX778076_OP_NAME   bitor_
 #define AUX778076_OP_PREFIX bitor
 #define AUX778076_OP_TOKEN  |
 #include <boost/mpl/aux_/arithmetic_op.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(bitor)
 #   pragma pop_macro("bitor")
 #endif
 #endif
-#endif
 
 #endif // BOOST_MPL_BITOR_HPP_INCLUDED

include/boost/mpl/or.hpp

@@ -29,26 +29,22 @@
 // '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)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(or)
 #   pragma push_macro("or")
 #   undef or
 #   define or(x)
 #endif
 #endif
-#endif
 
 #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
 #   include <boost/mpl/aux_/include_preprocessed.hpp>
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_EXTENSIONS)
-#ifndef __GCCXML__
 #if defined(or)
 #   pragma pop_macro("or")
 #endif
 #endif
-#endif
 
 #else
 

preprocessed/README.txt

@@ -5,12 +5,12 @@ 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>
+  python3 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
+  python3 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
@@ -22,7 +22,7 @@ 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
+  python3 boost_mpl_preprocess.py --help
 
 
 Fixing pre-processing of MPL-containers
@@ -44,12 +44,12 @@ 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>
+  python3 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>
+  python3 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

preprocessed/boost_mpl_preprocess.py

@@ -29,7 +29,7 @@ def create_more_container_files(sourceDir, suffix, maxElements, containers, cont
             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" ):
+            for line in fileinput.input( newFile, inplace=1, mode="r" ):
                 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())
@@ -43,7 +43,7 @@ def create_more_container_files(sourceDir, suffix, maxElements, containers, cont
             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" ):
+            for line in fileinput.input( newFile, inplace=1, mode="r" ):
                 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())
@@ -73,7 +73,7 @@ def adjust_container_limits_for_variadic_sequences(headerDir, containers, maxEle
         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" ):
+        for line in fileinput.input( headerFile, inplace=1, mode="r" ):
             line = re.sub(regexMatch, regexReplace, line.rstrip())
             print(line)
 
@@ -118,6 +118,11 @@ def to_existing_absolute_path(string):
 def main():
     """The main function."""
     
+    # Determine the currently running python executable.
+    python_executable = sys.executable
+    if python_executable == None or python_executable == "":
+        python_executable = python
+    
     # Find the current Boost source-directory in which this script is located.
     sourceDir = current_boost_dir()
     if sourceDir == None:
@@ -150,19 +155,19 @@ def main():
 
     # Some verbose debug output.
     if args.verbose:
-        print "Arguments extracted from command-line:"
+        print("Arguments extracted from command-line:")
-        print "  verbose          = ", args.verbose
+        print("  verbose          = ", args.verbose)
-        print "  source directory = ", args.sourceDir
+        print("  source directory = ", args.sourceDir)
-        print "  num elements     = ", args.numElements
+        print("  num elements     = ", args.numElements)
-        print "  sequence type    = ", args.seqType
+        print("  sequence type    = ", args.seqType)
-        print "  want: vector     = ", args.want_vector
+        print("  want: vector     = ", args.want_vector)
-        print "  want: list       = ", args.want_list
+        print("  want: list       = ", args.want_list)
-        print "  want: set        = ", args.want_set
+        print("  want: set        = ", args.want_set)
-        print "  want: map        = ", args.want_map
+        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."
+        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.
@@ -177,13 +182,13 @@ def main():
         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!"
+            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 header-directory: ", headerDir)
-        print "Chosen source-directory: ", sourceDir
+        print("Chosen source-directory: ", sourceDir)
 
     # Create list of containers for which files shall be pre-processed.
     containers = []
@@ -196,23 +201,23 @@ def main():
     if args.want_map:
         containers.append('map')
     if containers == []:
-        print "Nothing to do."
+        print("Nothing to do.")
-        print "(Why did you prevent generating pre-processed headers for all Boost.MPL container types?)"
+        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."
+        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("Fixing of some input-files prior to pre-processing is needed.")
-            print "Will fix them now!"
+            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
+        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":
@@ -226,24 +231,24 @@ def main():
     if args.seqType == "both" or args.seqType == "numbered":
         if args.want_vector:
             if args.verbose:
-                print "Pre-process headers for Boost.MPL numbered vectors."
+                print("Pre-process headers for Boost.MPL numbered vectors.")
-            os.system( "python " + os.path.join( sourceDir, "preprocess_vector.py" ) + " all " + args.sourceDir )
+            os.system( python_executable + " " + 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."
+                print("Pre-process headers for Boost.MPL numbered lists.")
-            os.system( "python " + os.path.join( sourceDir, "preprocess_list.py" ) + " all " + args.sourceDir )
+            os.system( python_executable + " " + 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."
+                print("Pre-process headers for Boost.MPL numbered sets.")
-            os.system( "python " + os.path.join( sourceDir, "preprocess_set.py" ) + " all " + args.sourceDir )
+            os.system( python_executable + " " + 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."
+                print("Pre-process headers for Boost.MPL numbered maps.")
-            os.system( "python " + os.path.join( sourceDir, "preprocess_map.py" ) + " all " + args.sourceDir )
+            os.system( python_executable + " " + 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."
+            print("Pre-process headers for Boost.MPL variadic containers.")
-        os.system( "python " + os.path.join( sourceDir, "preprocess.py" ) + " all " + args.sourceDir )
+        os.system( python_executable + " " + os.path.join( sourceDir, "preprocess.py" ) + " all " + args.sourceDir )
 
 
 if __name__ == '__main__':

preprocessed/fix_boost_mpl_preprocess.py

@@ -21,7 +21,7 @@ def check_header_comment(filename):
     # Check input file.
     name = os.path.basename( filename )
     # Read content of input file.
-    sourcefile = open( filename, "rU" )
+    sourcefile = open( filename, "r" )
     content = sourcefile.read()
     sourcefile.close()
     # Search content for '$Id$'.
@@ -66,26 +66,26 @@ def check_input_files(headerDir, sourceDir, containers=['vector', 'list', 'set',
     result1 = False
     if seqType == "both" or seqType == "variadic":
         if verbose:
-            print "Check if input files for pre-processing Boost.MPL variadic containers need fixing."
+            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!"
+                print("  At least one input file needs fixing!")
             else:
-                print "  No input file needs fixing!"
+                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."
+            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!"
+                print("  At least one input file needs fixing!")
             else:
-                print "  No input file needs fixing!"
+                print("  No input file needs fixing!")
     # Return result.
     return result1 or result2 or result3
 
@@ -93,7 +93,7 @@ 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" ):
+    for line in fileinput.input( filename, inplace=1, mode="r" ):
         # 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)!
@@ -128,12 +128,12 @@ def fix_input_files(headerDir, sourceDir, containers=['vector', 'list', 'set', '
     # 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."
+            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."
+            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)
 
@@ -164,10 +164,10 @@ def main():
 
     # Some verbose debug output.
     if args.verbose:
-        print "Arguments extracted from command-line:"
+        print("Arguments extracted from command-line:")
-        print "  verbose           = ", args.verbose
+        print("  verbose           = ", args.verbose)
-        print "  check-only        = ", args.checkonly
+        print("  check-only        = ", args.checkonly)
-        print "  source directory  = ", args.sourceDir
+        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.
@@ -181,21 +181,21 @@ def main():
         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!"
+            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 header-directory: ", headerDir)
-        print "Chosen source-directory: ", sourceDir
+        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."
+            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."
+            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)

preprocessed/pp.py

@@ -12,6 +12,7 @@
 # $Revision$
 
 import fileinput
+import functools
 import os
 import re
 import string
@@ -22,22 +23,21 @@ max_len = 79
 ident = 4
 
 def nearest_ident_pos(text):
-    return (len(text)/ident) * ident
+    return int((len(text)/ident) * ident)
     
 def block_format(limits, text, first_sep='  ', sep=',', need_last_ident=1 ):
-    if sep == ',' and string.find( text, '<' ) != -1:
+    if sep == ',' and str.find( text, '<' ) != -1:
         sep = '%s ' % sep
     
-    words = string.split(
+    words = str.split(
-          string.join( string.split( text ), ' ' )
+          ' '.join( str.split( text ) )
         , sep
         )
-
     s = ' ' * limits[0]
     max_len = limits[1]
     return '%s\n%s' \
         % (
-         reduce(
+         functools.reduce(
             lambda t,w,max_len=max_len,s=s,sep=sep:
                 if_else(t[1] + len(w) < max_len
                     , ('%s%s%s'% (t[0],t[2],w), t[1]+len(w)+len(t[2]), sep)
@@ -52,7 +52,6 @@ def block_format(limits, text, first_sep='  ', sep=',', need_last_ident=1 ):
 def handle_args( match ):
     if re.compile('^\s*(typedef|struct|static)\s+.*?$').match(match.group(0)):
         return match.group(0)
-    
     return '%s'\
         % block_format(
               (nearest_ident_pos(match.group(1)),max_len)
@@ -86,7 +85,7 @@ def handle_inline_args(match):
                  (nearest_ident_pos(match.group(1))+ident,max_len-len(match.group(9)))
                 , match.group(4)
                 )
-            , string.replace(match.group(1),',',' ')
+            , str.replace(match.group(1),',',' ')
             , match.group(9)
           )
 
@@ -98,18 +97,18 @@ def handle_simple_list(match):
     return if_else(single_arg,'%s<%s>','%s< %s >') %\
         (
           match.group(1)
-        , string.join(string.split(match.group(2)), '')
+        , ''.join(str.split(match.group(2)))
         )
 
 def handle_static(match):
     if len(match.group(0)) < max_len:
         return match.group(0)
 
-    (first_sep,sep) = if_else(string.find(match.group(0),'+') == -1, (' ',' '),('  ','+'))
+    (first_sep,sep) = if_else(str.find(match.group(0),'+') == -1, (' ',' '),('  ','+'))
     return '%s%s\n%s%s' %\
         (
           match.group(1)
-        , string.join(string.split(match.group(2)), ' ')
+        , ' '.join(str.split(match.group(2)))
         , block_format(
               (nearest_ident_pos(match.group(1))+ident,max_len)
             , match.group(4)
@@ -120,7 +119,7 @@ def handle_static(match):
         )
 
 def handle_typedefs(match):
-    if string.count(match.group(2), ';') == 1:
+    if str.count(match.group(2), ';') == 1:
         return match.group(0)
 
     join_sep = ';\n%s' % match.group(1)
@@ -128,7 +127,7 @@ def handle_typedefs(match):
     return '%s%s\n' \
         % (
             match.group(1)
-          , string.join(map(string.strip, string.split(match.group(2), ';')), join_sep)
+          , join_sep.join(list(map(str.strip, str.split(match.group(2), ';')))) 
           )
 
 def fix_angle_brackets( match ):

preprocessed/preprocess.py

@@ -57,10 +57,10 @@ def process_all( root, boost_root, dst_dir, mode ):
 
 def main( all_modes, src_dir, dst_dir ):
     if len( sys.argv ) < 2:
-        print "\nUsage:\n\t %s <mode> <boost_root> [<source_file>]" % os.path.basename( sys.argv[0] )
+        print("\nUsage:\n\t %s <mode> <boost_root> [<source_file>]" % os.path.basename( sys.argv[0] ))
-        print "\nPurpose:\n\t updates preprocessed version(s) of the header(s) in \"%s\" directory" % dst_dir
+        print("\nPurpose:\n\t updates preprocessed version(s) of the header(s) in \"%s\" directory" % dst_dir)
-        print "\nExample:\n\t the following command will re-generate and update all 'apply.hpp' headers:"
+        print("\nExample:\n\t the following command will re-generate and update all 'apply.hpp' headers:")
-        print "\n\t\t %s all f:\\cvs\\boost apply.cpp" % os.path.basename( sys.argv[0] )
+        print("\n\t\t %s all f:\\cvs\\boost apply.cpp" % os.path.basename( sys.argv[0] ))
         sys.exit( -1 )
 
     if sys.argv[1] == "all":

test/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright 2018, 2019 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
+
+if(HAVE_BOOST_TEST)
+
+boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::mpl Boost::bind)
+
+endif()

test/Jamfile.v2

@@ -1,10 +1,8 @@
 project
     :   requirements
-        <define>BOOST_ALL_NO_LIB=1
+        <library>/boost/mpl//boost_mpl
-        <warnings>all
+        <warnings>extra
-        <toolset>clang:<cxxflags>-Wextra
         <toolset>clang:<cxxflags>-Wno-variadic-macros
-        <toolset>gcc:<cxxflags>-Wextra
         <toolset>gcc:<cxxflags>-Wshadow
         <toolset>gcc:<cxxflags>-Wno-variadic-macros
         <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
@@ -14,104 +12,107 @@ import common ;
 import os ;
 import testing ;
 
-test-suite mpl :
+compile aux_/increased_arity.cpp ;
+compile aux_/largest_int.cpp ;
+compile aux_/msvc_is_class.cpp ;
+compile aux_/template_arity.cpp ;
+compile aux_/preprocessor/is_seq.cpp ;
+compile aux_/preprocessor/token_equal.cpp ;
 
-    [ compile aux_/increased_arity.cpp ]
+compile advance.cpp ;
-    [ compile aux_/largest_int.cpp ]
+compile always.cpp ;
-    [ compile aux_/msvc_is_class.cpp ]
+compile apply.cpp ;
-    [ compile aux_/template_arity.cpp ]
+compile apply_wrap.cpp ;
-    [ compile aux_/preprocessor/is_seq.cpp ]
+compile arithmetic.cpp ;
-    [ compile aux_/preprocessor/token_equal.cpp ]
+compile as_sequence.cpp ;
-    
+compile assert.cpp ;
-    [ compile advance.cpp ]
+# link assert_vc8_p1.cpp assert_vc8_p2.cpp
-    [ compile always.cpp ]
+compile at.cpp ;
-    [ compile apply.cpp ]
+compile back.cpp ;
-    [ compile apply_wrap.cpp ]
+compile bind.cpp ;
-    [ compile arithmetic.cpp ]
+compile bitwise.cpp ;
-    [ compile as_sequence.cpp ]
+run bool.cpp ;
-    [ compile assert.cpp ]
+compile comparison.cpp ;
-    # link assert_vc8_p1.cpp assert_vc8_p2.cpp
+compile contains.cpp ;
-    [ compile at.cpp ]
+compile copy.cpp ;
-    [ compile back.cpp ]
+compile copy_if.cpp ;
-    [ compile bind.cpp ]
+compile count.cpp ;
-    [ compile bitwise.cpp ]
+compile count_if.cpp ;
-    [ run bool.cpp ]
+compile deque.cpp ;
-    [ compile comparison.cpp ]
+compile distance.cpp ;
-    [ compile contains.cpp ]
+compile empty.cpp ;
-    [ compile copy.cpp ]
+compile equal.cpp ;
-    [ compile copy_if.cpp ]
+compile erase.cpp ;
-    [ compile count.cpp ]
+compile erase_range.cpp ;
-    [ compile count_if.cpp ]
+compile eval_if.cpp ;
-    [ compile deque.cpp ]
+compile filter_view.cpp ;
-    [ compile distance.cpp ]
+compile find.cpp ;
-    [ compile empty.cpp ]
+compile find_if.cpp ;
-    [ compile equal.cpp ]
+compile fold.cpp ;
-    [ compile erase.cpp ]
+run for_each.cpp
-    [ compile erase_range.cpp ]
+  : : : <cxxstd>98:<build>no <cxxstd>03:<build>no
-    [ compile eval_if.cpp ]
+    <library>/boost/bind//boost_bind ;
-    [ compile filter_view.cpp ]
+compile front.cpp ;
-    [ compile find.cpp ]
+compile get_tag_def.cpp ;
-    [ compile find_if.cpp ]
+compile has_xxx.cpp ;
-    [ compile fold.cpp ]
+compile identity.cpp ;
-    [ run for_each.cpp ]
+compile if.cpp ;
-    [ compile front.cpp ]
+compile index_of.cpp ;
-    [ compile get_tag_def.cpp ]
+compile inherit.cpp ;
-    [ compile has_xxx.cpp ]
+compile insert.cpp ;
-    [ compile identity.cpp ]
+compile insert_range.cpp ;
-    [ compile if.cpp ]
+run int.cpp ;
-    [ compile index_of.cpp ]
+run char.cpp : : :                                                                    : char                ;
-    [ compile inherit.cpp ]
+run char.cpp : : : <toolset>gcc:<cxxflags>"-funsigned-char -Wnarrowing -Werror"       : char_unsigned       ;
-    [ compile insert.cpp ]
+run integral_c.cpp : : : <toolset>vacpp:<cxxflags>-qchars=signed                      : integral_c          ;
-    [ compile insert_range.cpp ]
+run integral_c.cpp : : : <toolset>gcc:<cxxflags>"-funsigned-char -Wnarrowing -Werror" : integral_c_unsigned ;
-    [ run int.cpp ]
+compile is_placeholder.cpp ;
-    [ run char.cpp ]
+compile is_sequence.cpp ;
-    [ run integral_c.cpp : : : <toolset>vacpp:<cxxflags>-qchars=signed ]
+compile iterator_tags.cpp ;
-    [ compile is_placeholder.cpp ]
+compile joint_view.cpp ;
-    [ compile is_sequence.cpp ]
+compile lambda.cpp ;
-    [ compile iterator_tags.cpp ]
+compile lambda_args.cpp ;
-    [ compile joint_view.cpp ]
+compile list.cpp ;
-    [ compile lambda.cpp ]
+compile list_c.cpp ;
-    [ compile lambda_args.cpp ]
+compile logical.cpp ;
-    [ compile list.cpp ]
+compile lower_bound.cpp ;
-    [ compile list_c.cpp ]
+compile map.cpp ;
-    [ compile logical.cpp ]
+compile max_element.cpp ;
-    [ compile lower_bound.cpp ]
+compile min_max.cpp ;
-    [ compile map.cpp ]
+compile multiset.cpp ;
-    [ compile max_element.cpp ]
+compile next.cpp ;
-    [ compile min_max.cpp ]
+compile no_has_xxx.cpp ;
-    [ compile multiset.cpp ]
+compile numeric_ops.cpp ;
-    [ compile next.cpp ]
+compile pair_view.cpp ;
-    [ compile no_has_xxx.cpp ]
+compile partition.cpp ;
-    [ compile numeric_ops.cpp ]
+compile pop_front.cpp ;
-    [ compile pair_view.cpp ]
+compile push_back.cpp ;
-    [ compile partition.cpp ]
+compile push_front.cpp ;
-    [ compile pop_front.cpp ]
+compile quote.cpp ;
-    [ compile push_back.cpp ]
+compile range_c.cpp ;
-    [ compile push_front.cpp ]
+compile remove.cpp ;
-    [ compile quote.cpp ]
+compile remove_if.cpp ;
-    [ compile range_c.cpp ]
+compile replace.cpp ;
-    [ compile remove.cpp ]
+compile replace_if.cpp ;
-    [ compile remove_if.cpp ]
+compile reverse.cpp ;
-    [ compile replace.cpp ]
+compile same_as.cpp ;
-    [ compile replace_if.cpp ]
+compile set.cpp ;
-    [ compile reverse.cpp ]
+compile set_c.cpp ;
-    [ compile same_as.cpp ]
+compile single_view.cpp ;
-    [ compile set.cpp ]
+compile size.cpp ;
-    [ compile set_c.cpp ]
+run size_t.cpp ;
-    [ compile single_view.cpp ]
+compile sizeof.cpp ;
-    [ compile size.cpp ]
+compile sort.cpp ;
-    [ run size_t.cpp ]
+compile stable_partition.cpp ;
-    [ compile sizeof.cpp ]
+compile transform.cpp ;
-    [ compile sort.cpp ]
+compile transform_view.cpp ;
-    [ compile stable_partition.cpp ]
+compile unique.cpp ;
-    [ compile transform.cpp ]
+compile unpack_args.cpp ;
-    [ compile transform_view.cpp ]
+compile upper_bound.cpp ;
-    [ compile unique.cpp ]
+compile vector.cpp ;
-    [ compile unpack_args.cpp ]
+compile vector_c.cpp ;
-    [ compile upper_bound.cpp ]
+compile zip_view.cpp ;
-    [ compile vector.cpp ]
+run string.cpp ;
-    [ compile vector_c.cpp ]
-    [ compile zip_view.cpp ]
-    [ run string.cpp ]
-    ;
 
+run issue_69.cpp ;
+run issue_84.cpp ;

test/char.cpp

@@ -13,12 +13,17 @@
 
 #include <boost/mpl/char.hpp>
 #include <boost/preprocessor/repeat.hpp>
+#include <climits>
 
 #include "integral_wrapper_test.hpp"
 
 
 MPL_TEST_CASE()
 {
+#if CHAR_MAX > 0
+#   define WRAPPER(T, i) char_<static_cast<char>(i)>
+#else
 #   define WRAPPER(T, i) char_<i>
+#endif
     BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, char)
 }

test/cmake_install_test/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright 2018 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_install_test LANGUAGES CXX)
+
+find_package(boost_mpl REQUIRED)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::mpl)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_install_test/main.cpp

@@ -0,0 +1,10 @@
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/mpl/assert.hpp>
+
+int main()
+{
+    BOOST_MPL_ASSERT_RELATION( 1, <, 5 );
+}

test/cmake_subdir_test/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright 2018 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+cmake_minimum_required(VERSION 3.5...3.16)
+
+project(cmake_subdir_test LANGUAGES CXX)
+
+add_subdirectory(../.. boostorg/mpl)
+
+add_subdirectory(../../../assert boostorg/assert)
+add_subdirectory(../../../config boostorg/config)
+add_subdirectory(../../../core boostorg/core)
+add_subdirectory(../../../io boostorg/io)
+add_subdirectory(../../../predef boostorg/predef)
+add_subdirectory(../../../preprocessor boostorg/preprocessor)
+add_subdirectory(../../../static_assert boostorg/static_assert)
+add_subdirectory(../../../throw_exception boostorg/throw_exception)
+add_subdirectory(../../../type_traits boostorg/type_traits)
+add_subdirectory(../../../utility boostorg/utility)
+
+add_executable(main main.cpp)
+target_link_libraries(main Boost::mpl)
+
+enable_testing()
+add_test(NAME main COMMAND main)
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_subdir_test/main.cpp

@@ -0,0 +1,10 @@
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/mpl/assert.hpp>
+
+int main()
+{
+    BOOST_MPL_ASSERT_RELATION( 1, <, 5 );
+}

test/integral_c.cpp

@@ -13,6 +13,7 @@
 
 #include <boost/mpl/integral_c.hpp>
 #include <boost/preprocessor/repeat.hpp>
+#include <climits>
 
 #include "integral_wrapper_test.hpp"
 
@@ -21,10 +22,14 @@ MPL_TEST_CASE()
 {
 #   define WRAPPER(T, i) integral_c<T,i>
 
-#if !(defined(__APPLE_CC__) && defined(__GNUC__) && (__GNUC__ == 3) && (__GNUC_MINOR__ <= 3))
-    BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, char)
-#endif
     BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, short)
     BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, int)
     BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, long)
+
+#if CHAR_MAX > 0
+#   undef WRAPPER
+#   define WRAPPER(T, i) integral_c<T,static_cast<T>(i)>
+#endif
+
+    BOOST_PP_REPEAT(10, INTEGRAL_WRAPPER_TEST, char)
 }

test/issue_69.cpp

@@ -0,0 +1,13 @@
+// Copyright 2024 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0. 
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/mpl/integral_c.hpp>
+
+enum test { zero, one };
+
+int main()
+{
+    boost::mpl::integral_c<test, zero> m;
+    return m.value;
+}

test/issue_84.cpp

@@ -0,0 +1,15 @@
+// Copyright 2025 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0. 
+// https://www.boost.org/LICENSE_1_0.txt
+
+// Check for conflicts with MS iso646.h, which defines macros for `and` et al
+
+#include <ciso646>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/mpl/bitand.hpp>
+#include <boost/mpl/bitor.hpp>
+
+int main()
+{
+}