From 721776d544d6f3d466ae9961c6196fda1771f809 Mon Sep 17 00:00:00 2001 From: Dmitry Arkhipov Date: Sat, 17 Jan 2026 21:31:15 +0300 Subject: [PATCH 1/3] remove build subdirectory --- build/Jamfile | 30 ----------- build/preprocess_arity_loops.cpp | 88 -------------------------------- build/preprocess_cc_names.cpp | 27 ---------- build/preprocess_encoding.cpp | 45 ---------------- build/timestamps/arity_loops | 1 - build/timestamps/cc_names | 1 - build/timestamps/encoding | 1 - 7 files changed, 193 deletions(-) delete mode 100644 build/Jamfile delete mode 100644 build/preprocess_arity_loops.cpp delete mode 100644 build/preprocess_cc_names.cpp delete mode 100644 build/preprocess_encoding.cpp delete mode 100644 build/timestamps/arity_loops delete mode 100644 build/timestamps/cc_names delete mode 100644 build/timestamps/encoding diff --git a/build/Jamfile b/build/Jamfile deleted file mode 100644 index 38b185a2..00000000 --- a/build/Jamfile +++ /dev/null @@ -1,30 +0,0 @@ - -# (C) Copyright Tobias Schwinger -# -# Use modification and distribution are subject to the boost Software License, -# Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -# Generates preprocessed files with wave. - -actions wave -{ - $(>[1]) -S../../.. $(>[2]) -o $(<) -} - -W = ../../../tools/wave/build//wave ; - -make arity_loops - : preprocess_arity_loops.cpp $(W) : wave : build/timestamps - ; - -make encoding - : preprocess_encoding.cpp $(W) : wave : build/timestamps - ; - - -make cc_names - : preprocess_cc_names.cpp $(W) : wave : build/timestamps - ; - -explicit arity_loops encoding cc_names ; - diff --git a/build/preprocess_arity_loops.cpp b/build/preprocess_arity_loops.cpp deleted file mode 100644 index d39b65cf..00000000 --- a/build/preprocess_arity_loops.cpp +++ /dev/null @@ -1,88 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#if !defined(BOOST_FT_PREPROCESSING_MODE) - -# ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -# endif - -# include -# include - -# if BOOST_PP_NIL // enable dependency scanning for dynamically included files -# include -# include -# include -# include -# endif - -# pragma wave option(line: 0, preserve: 2) -timestamp file -# pragma wave option(output: null) - -# define BOOST_FT_PREPROCESSING_MODE - -# define BOOST_FT_HEADER \ - BOOST_PP_SEQ_CAT((arity)(BOOST_FT_MAX_ARITY)(_)(BOOST_FT_mfp)).hpp - #define BOOST_FT_OUT_FILE \ - BOOST_PP_STRINGIZE(../../../BOOST_FT_al_path/BOOST_FT_HEADER) - -# define BOOST_FT_al_path boost/function_types/detail/components_impl -# include __FILE__ -# undef BOOST_FT_al_path - -# define BOOST_FT_al_path boost/function_types/detail/synthesize_impl -# include __FILE__ -# undef BOOST_FT_al_path - -# define BOOST_FT_al_path boost/function_types/detail/classifier_impl -# include __FILE__ -# undef BOOST_FT_al_path - -#elif !defined(BOOST_FT_mfp) - -# define BOOST_FT_mfp 0 -# include __FILE__ -# undef BOOST_FT_mfp - -# define BOOST_FT_mfp 1 -# include __FILE__ -# undef BOOST_FT_mfp - -#elif !defined(BOOST_FT_MAX_ARITY) - -# define BOOST_FT_FROM_ARITY 0 -# define BOOST_FT_MAX_ARITY 10 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 10 -# define BOOST_FT_MAX_ARITY 20 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 20 -# define BOOST_FT_MAX_ARITY 30 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 30 -# define BOOST_FT_MAX_ARITY 40 -# include __FILE__ - -# define BOOST_FT_FROM_ARITY 40 -# define BOOST_FT_MAX_ARITY 50 -# include __FILE__ - -#else - -# pragma message(generating BOOST_FT_OUT_FILE) -# pragma wave option(preserve: 2, output: BOOST_FT_OUT_FILE) -# include -# undef BOOST_FT_MAX_ARITY - -#endif - diff --git a/build/preprocess_cc_names.cpp b/build/preprocess_cc_names.cpp deleted file mode 100644 index 803667c5..00000000 --- a/build/preprocess_cc_names.cpp +++ /dev/null @@ -1,27 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -#endif - -#pragma wave option(line: 0, preserve: 2) -timestamp file -#pragma wave option(output: null) - -#define BOOST_FT_PREPROCESSING_MODE - - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_cc_loop/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - diff --git a/build/preprocess_encoding.cpp b/build/preprocess_encoding.cpp deleted file mode 100644 index 886bec33..00000000 --- a/build/preprocess_encoding.cpp +++ /dev/null @@ -1,45 +0,0 @@ - -// (C) Copyright Tobias Schwinger -// -// Use modification and distribution are subject to the boost Software License, -// Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). - -//------------------------------------------------------------------------------ - -#ifndef __WAVE__ -# error "Boost.Wave preprocessor required" -#endif - -#pragma wave option(line: 0, preserve: 2) -timestamp file -#pragma wave option(output: null) - -#define BOOST_FT_PREPROCESSING_MODE - - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_tags/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_variate_loop/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) -#undef BOOST_FT_OUT_FILE - -#define BOOST_FT_OUT_FILE \ - "../../../boost/function_types/detail/pp_retag_default_cc/preprocessed.hpp" -#pragma message(generating BOOST_FT_OUT_FILE) -#pragma wave option(output: BOOST_FT_OUT_FILE, preserve: 2) -#include -#pragma wave option(output: null) - -#undef BOOST_FT_OUT_FILE - - diff --git a/build/timestamps/arity_loops b/build/timestamps/arity_loops deleted file mode 100644 index f91091c8..00000000 --- a/build/timestamps/arity_loops +++ /dev/null @@ -1 +0,0 @@ -timestamp file diff --git a/build/timestamps/cc_names b/build/timestamps/cc_names deleted file mode 100644 index f91091c8..00000000 --- a/build/timestamps/cc_names +++ /dev/null @@ -1 +0,0 @@ -timestamp file diff --git a/build/timestamps/encoding b/build/timestamps/encoding deleted file mode 100644 index f91091c8..00000000 --- a/build/timestamps/encoding +++ /dev/null @@ -1 +0,0 @@ -timestamp file From e454e797fbd2e1df704306e8ef70836e8bcb71ae Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 19 Jan 2026 12:23:42 +0200 Subject: [PATCH 2/3] Update appveyor.yml --- appveyor.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 142fca2d..937c3aaf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,39 +10,38 @@ branches: only: - master - develop + - /feature\/.*/ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-10.0,msvc-11.0 - ADDRMD: 32 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-12.0,msvc-14.0 - ADDRESS_MODEL: 32,64 + TOOLSET: msvc-14.0 + CXXSTD: 14,latest + ADDRMD: 32,64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 TOOLSET: msvc-14.1 - CXXSTD: 14,17 - ADDRESS_MODEL: 32,64 + CXXSTD: 14,17,latest + ADDRMD: 32,64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 TOOLSET: msvc-14.2 - CXXSTD: 14,17 - ADDRESS_MODEL: 32,64 + CXXSTD: 14,17,20,latest + ADDRMD: 32,64 install: + - set BOOST_BRANCH=develop + - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master - cd .. - - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root + - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule update --init tools/build - - git submodule update --init libs/config - git submodule update --init tools/boostdep - - git submodule update --init tools/boost_install - - git submodule update --init libs/headers - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types - python tools/boostdep/depinst/depinst.py -I example function_types - - bootstrap - - b2 headers + - cmd /c bootstrap + - b2 -d0 headers build: off test_script: - - b2 libs/function_types/test toolset=%TOOLSET% + - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% + - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD% + - b2 -j3 libs/function_types/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release embed-manifest-via=linker From 927329df619b8b2c49ae2a130c2e80d3f66cfa7a Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Thu, 22 Jan 2026 23:05:46 +0300 Subject: [PATCH 3/3] Remove dependencies on Boost.StaticAssert. Boost.StaticAssert has been merged into Boost.Config, so remove the dependency. --- test/cmake_subdir_test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/cmake_subdir_test/CMakeLists.txt b/test/cmake_subdir_test/CMakeLists.txt index e8a7ca0d..14be08e0 100644 --- a/test/cmake_subdir_test/CMakeLists.txt +++ b/test/cmake_subdir_test/CMakeLists.txt @@ -22,7 +22,6 @@ type_traits # Secondary dependencies assert -static_assert throw_exception predef utility