Switch Boost.System to header-only in b2

Update ci.yml
Change assertions in operator* to match documentation; improves codegen slightly in the result<U&> case
2025-12-25 08:18:05 +01:00 · 2025-06-26 16:37:21 +03:00 · 2025-06-26 15:59:21 +03:00 · 2025-02-24 19:46:43 +02:00 · 2024-12-14 11:02:33 +02:00 · 2024-12-14 11:01:15 +02:00
10 changed files with 141 additions and 138 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -32,6 +32,8 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
            commands:
            [
                'set -e',
+                'uname -a',
+                'echo $DRONE_STAGE_MACHINE',
                'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
            ] +
            (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
@@ -203,44 +205,37 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 32 UBSAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 32 UBSAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 64 UBSAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 64 UBSAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 32 ASAN",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 GCC 13 32 ASAN",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
        "g++-13-multilib",
    ),

    linux_pipeline(
-        "Linux 23.04 GCC 13 64 ASAN",
-        "cppalliance/droneubuntu2304:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
-        "g++-13-multilib",
-    ),
-
-    linux_pipeline(
-        "Linux 24.04 GCC 14 32",
+        "Linux 24.04 GCC 14 UBSAN",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' },
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b' } + ubsan,
        "g++-14-multilib",
    ),

    linux_pipeline(
-        "Linux 24.04 GCC 14 64",
+        "Linux 24.04 GCC 14 ASAN",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' },
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b' } + asan,
        "g++-14-multilib",
    ),

@@ -294,15 +289,15 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 23.04 Clang 16",
-        "cppalliance/droneubuntu2304:1",
+        "Linux 24.04 Clang 16",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '11,14,17,20,2b' },
        "clang-16",
    ),

    linux_pipeline(
-        "Linux 23.10 Clang 17",
-        "cppalliance/droneubuntu2310:1",
+        "Linux 24.04 Clang 17",
+        "cppalliance/droneubuntu2404:1",
        { TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' },
        "clang-17",
    ),
@@ -321,6 +316,13 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "clang-18",
    ),

+    linux_pipeline(
+        "Linux 24.10 Clang 19",
+        "cppalliance/droneubuntu2410:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '11,14,17,20,2b' },
+        "clang-19",
+    ),
+
    macos_pipeline(
        "MacOS 10.15 Xcode 12.2 UBSAN",
        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '11,14,1z' } + ubsan,
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,33 +19,36 @@ jobs:
        include:
          - toolset: gcc-4.8
            cxxstd: "11"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-4.8
          - toolset: gcc-5
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-5
          - toolset: gcc-6
            cxxstd: "11,14,1z"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
            install: g++-6
          - toolset: gcc-7
            cxxstd: "11,14,17"
-            os: ubuntu-latest
            container: ubuntu:18.04
+            os: ubuntu-latest
          - toolset: gcc-8
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-8
          - toolset: gcc-9
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
          - toolset: gcc-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: g++-10
          - toolset: gcc-11
            cxxstd: "11,14,17,2a"
@@ -57,13 +60,18 @@ jobs:
          - toolset: gcc-13
            cxxstd: "11,14,17,20,2b"
            os: ubuntu-latest
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            install: g++-13
          - toolset: gcc-14
            cxxstd: "11,14,17,20,2b"
            os: ubuntu-latest
            container: ubuntu:24.04
            install: g++-14
+          - toolset: gcc-15
+            cxxstd: "11,14,17,20,23,2c"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install: g++-15
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "11,14"
@@ -85,35 +93,45 @@ jobs:
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-7
          - toolset: clang
            compiler: clang++-8
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-8
          - toolset: clang
            compiler: clang++-9
            cxxstd: "11,14,17"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
            install: clang-9
          - toolset: clang
            compiler: clang++-10
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-10
          - toolset: clang
            compiler: clang++-11
            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-11
          - toolset: clang
            compiler: clang++-12
            cxxstd: "11,14,17,20"
-            os: ubuntu-20.04
+            container: ubuntu:20.04
+            os: ubuntu-latest
+            install: clang-12
          - toolset: clang
            compiler: clang++-13
            cxxstd: "11,14,17,20,2b"
@@ -135,13 +153,13 @@ jobs:
          - toolset: clang
            compiler: clang++-16
            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.04
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-16
          - toolset: clang
            compiler: clang++-17
            cxxstd: "11,14,17,20,2b"
-            container: ubuntu:23.10
+            container: ubuntu:24.04
            os: ubuntu-latest
            install: clang-17
          - toolset: clang
@@ -151,30 +169,54 @@ jobs:
            os: ubuntu-latest
            install: clang-18
          - toolset: clang
+            compiler: clang++-19
            cxxstd: "11,14,17,20,2b"
-            os: macos-12
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-19
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "11,14,17,20,23,2c"
+            container: ubuntu:25.04
+            os: ubuntu-latest
+            install: clang-20
          - toolset: clang
            cxxstd: "11,14,17,20,2b"
            os: macos-13
          - toolset: clang
            cxxstd: "11,14,17,20,2b"
            os: macos-14
+          - toolset: clang
+            cxxstd: "11,14,17,20,2b"
+            os: macos-15

    runs-on: ${{matrix.os}}
-    container: ${{matrix.container}}
+
+    container:
+      image: ${{matrix.container}}
+      volumes:
+        - /node20217:/node20217:rw,rshared
+        - ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}

    defaults:
      run:
        shell: bash

    steps:
-      - uses: actions/checkout@v3
-
      - name: Setup container environment
        if: matrix.container
        run: |
          apt-get update
-          apt-get -y install sudo python3 git g++
+          apt-get -y install sudo python3 git g++ curl xz-utils
+
+      - name: Install nodejs20glibc2.17
+        if: ${{ startsWith( matrix.container, 'ubuntu:1' ) }}
+        run: |
+          curl -LO https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz
+          tar -xf node-v20.9.0-linux-x64-glibc-217.tar.xz --strip-components 1 -C /node20217
+          ldd /__e/node20/bin/node
+
+      - uses: actions/checkout@v4

      - name: Install packages
        if: matrix.install
@@ -278,11 +320,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

@@ -326,11 +368,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

@@ -384,11 +426,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
-          - os: macos-12
+          - os: ubuntu-24.04
          - os: macos-13
          - os: macos-14
+          - os: macos-15

    runs-on: ${{matrix.os}}

@@ -442,6 +484,7 @@ jobs:
        include:
          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}

@@ -491,6 +534,7 @@ jobs:
        include:
          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}

@@ -558,6 +602,7 @@ jobs:
        include:
          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}

--- a/build.jam
+++ b/build.jam
@@ -0,0 +1,24 @@
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/config//boost_config
+    /boost/throw_exception//boost_throw_exception
+    /boost/variant2//boost_variant2
+    /boost/winapi//boost_winapi
+    ;
+
+project /boost/system ;
+
+explicit
+    [ alias boost_system : : : : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_system test ]
+    ;
+
+call-if : boost-library system
+    ;
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,25 +0,0 @@
-# Boost System Library Build Jamfile
-
-# (C) Copyright Beman Dawes 2002, 2006
-
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
-
-# See library home page at https://www.boost.org/libs/system
-
-project boost/system
-    : source-location ../src
-    : usage-requirements  # pass these requirement to dependents (i.e. users)
-      <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
-      <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
-    ;
-
-SOURCES = error_code ;
-
-lib boost_system
-   : $(SOURCES).cpp
-   : <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
-     <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
-   ;
-
-boost-install boost_system ;
--- a/include/boost/system/detail/system_category_message_win32.hpp
+++ b/include/boost/system/detail/system_category_message_win32.hpp
@@ -73,7 +73,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
        DWORD_ retval = boost::winapi::FormatMessageA(
            FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
            NULL,
-            ev,
+            static_cast<DWORD_>(ev),
            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
            buffer,
            static_cast<DWORD_>( len ),
@@ -94,7 +94,7 @@ inline char const * system_category_message_win32( int ev, char * buffer, std::s
        DWORD_ retval = boost::winapi::FormatMessageW(
            FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
            NULL,
-            ev,
+            static_cast<DWORD_>(ev),
            MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
            (LPWSTR_) &lpMsgBuf,
            0,
@@ -152,7 +152,7 @@ inline std::string system_category_message_win32( int ev )
    DWORD_ retval = boost::winapi::FormatMessageW(
        FORMAT_MESSAGE_ALLOCATE_BUFFER_ | FORMAT_MESSAGE_FROM_SYSTEM_ | FORMAT_MESSAGE_IGNORE_INSERTS_,
        NULL,
-        ev,
+        static_cast<DWORD_>(ev),
        MAKELANGID_( LANG_NEUTRAL_, SUBLANG_DEFAULT_ ), // Default language
        (LPWSTR_) &lpMsgBuf,
        0,
@@ -176,7 +176,7 @@ inline std::string system_category_message_win32( int ev )
        return unknown_message_win32( ev );
    }

-    std::string buffer( r, char() );
+    std::string buffer( static_cast<std::size_t>(r), char() );

    r = boost::winapi::WideCharToMultiByte( code_page, 0, lpMsgBuf, -1, &buffer[0], r, NULL, NULL );

@@ -187,12 +187,12 @@ inline std::string system_category_message_win32( int ev )

    --r; // exclude null terminator

-    while( r > 0 && ( buffer[ r-1 ] == '\n' || buffer[ r-1 ] == '\r' ) )
+    while( r > 0 && ( buffer[ static_cast<std::size_t>(r)-1 ] == '\n' || buffer[ static_cast<std::size_t>(r)-1 ] == '\r' ) )
    {
        --r;
    }

-    if( r > 0 && buffer[ r-1 ] == '.' )
+    if( r > 0 && buffer[ static_cast<std::size_t>(r)-1 ] == '.' )
    {
        --r;
    }
--- a/include/boost/system/result.hpp
+++ b/include/boost/system/result.hpp
@@ -332,40 +332,28 @@ public:

    BOOST_CXX14_CONSTEXPR T& operator*() noexcept
    {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    BOOST_CXX14_CONSTEXPR T const& operator*() const noexcept
    {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

 #else

    BOOST_CXX14_CONSTEXPR T& operator*() & noexcept
    {
-        T* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    BOOST_CXX14_CONSTEXPR T const& operator*() const & noexcept
    {
-        T const* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    template<class U = T>
@@ -838,11 +826,8 @@ public:

    BOOST_CXX14_CONSTEXPR U& operator*() const noexcept
    {
-        U* p = operator->();
-
-        BOOST_ASSERT( p != 0 );
-
-        return *p;
+        BOOST_ASSERT( has_value() );
+        return *operator->();
    }

    // error access
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -1,31 +0,0 @@
-//  error_code stub implementation, for compatibility only
-
-//  Copyright Beman Dawes 2002, 2006
-//  Copyright Peter Dimov 2018
-
-//  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 library home page at http://www.boost.org/libs/system
-
-//----------------------------------------------------------------------------//
-
-// define BOOST_SYSTEM_SOURCE so that <boost/system/config.hpp> knows
-// the library is being built (possibly exporting rather than importing code)
-#define BOOST_SYSTEM_SOURCE
-
-#include <boost/system/config.hpp>
-
-namespace boost
-{
-
-namespace system
-{
-
-BOOST_SYSTEM_DECL void dummy_exported_function()
-{
-}
-
-} // namespace system
-
-} // namespace boost
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -17,6 +17,9 @@ project

  : requirements

+    <library>/boost/system//boost_system
+    <library>/boost/core//boost_core
+
    <toolset>msvc:<warnings-as-errors>on
    <toolset>gcc:<warnings-as-errors>on
    <toolset>clang:<warnings-as-errors>on
--- a/test/cmake_install_test/CMakeLists.txt
+++ b/test/cmake_install_test/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(main Boost::system)
 enable_testing()
 add_test(main main)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)
--- a/test/cmake_subdir_test/CMakeLists.txt
+++ b/test/cmake_subdir_test/CMakeLists.txt
@@ -23,4 +23,4 @@ target_link_libraries(quick Boost::system Boost::core)
 enable_testing()
 add_test(quick quick)

-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure --no-tests=error -C $<CONFIG>)
+add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure --no-tests=error -C $<CONFIG>)
Author	SHA1	Message	Date
Peter Dimov	7a495bb46d	Switch Boost.System to header-only in b2	2025-06-26 16:37:21 +03:00
Peter Dimov	db00e1848e	Update ci.yml	2025-06-26 15:59:21 +03:00
Peter Dimov	7a49a5d80d	Change assertions in operator* to match documentation; improves codegen slightly in the result<U&> case	2025-02-24 19:46:43 +02:00
Peter Dimov	a0597f4872	Update .drone.jsonnet	2024-12-14 11:02:33 +02:00
Peter Dimov	485be93281	Apply Node20 workaround	2024-12-14 11:01:15 +02:00
Peter Dimov	ee0b15efc4	Update ci.yml	2024-12-14 11:00:28 +02:00
Peter Dimov	09f4eb87e2	Merge pull request #125 from igaztanaga/patch-1 Update system_category_message_win32.hpp	2024-09-05 21:25:41 +03:00
Peter Dimov	3e5ce27719	Add VERBATIM to add_custom_target	2024-08-28 03:02:08 +03:00
Peter Dimov	40bdcea2e5	Update build.jam, build/Jamfile, test/Jamfile	2024-08-28 02:10:03 +03:00
Rene Rivera	19bcfebf37	Sync from upstream.	2024-08-20 09:56:38 -05:00
Ion Gaztañaga	6d58d0bb76	Update system_category_message_win32.hpp Fixes for Wsign-conversion with MinGW64 ("conversion to 'DWORD' {aka 'long unsigned int'} from 'int' may change the sign of the result")	2024-08-19 01:10:16 +02:00
Peter Dimov	a664cd1de6	Update .drone.jsonnet	2024-08-18 11:46:25 +03:00
Peter Dimov	e8a089b664	Update ci.yml	2024-08-17 18:22:21 +03:00
Rene Rivera	75e1a1e28b	Update build deps.	2024-08-09 20:26:47 -05:00
Rene Rivera	5feb280612	Move inter-lib dependencies to a project variable and into the build targets.	2024-07-23 22:34:22 -05:00
Rene Rivera	fc3ab6db97	Update copyright dates.	2024-07-20 22:52:03 -05:00
Rene Rivera	91929719bd	Change all <source> references to <library>.	2024-07-20 21:26:25 -05:00
Rene Rivera	8d0fa396b8	Bump B2 require to 5.2	2024-06-14 11:33:56 -05:00
Rene Rivera	671d0ad41b	Sync from upstream.	2024-06-02 23:25:04 -05:00
Rene Rivera	341f960e72	Sync from upstream.	2024-06-02 13:49:02 -05:00
Rene Rivera	9b82082f76	Add requires-b2 check to top-level build file.	2024-05-05 09:00:01 -05:00
Rene Rivera	3c293f8740	Add missing NO_LIB usage requirements.	2024-04-28 20:17:00 -05:00
Rene Rivera	2feb94ac07	Sync from upstream.	2024-04-20 15:31:42 -05:00
Rene Rivera	d09b2f5f1d	Sync from upstream.	2024-04-10 07:55:53 -05:00
Rene Rivera	27a5096b6c	Switch to library requirements instead of source. As source puts extra source in install targets.	2024-03-29 21:15:59 -05:00
Rene Rivera	9cc66841c4	Make the library modular usable.	2024-03-11 08:38:16 -05:00