Avoid -Wundef warnings

Revert "Don't double-rethrow std::exception_ptr (#53 )"
This reverts commit ea70868a45.
2025-06-30 22:41:08 +02:00 · 2024-01-06 16:30:15 +02:00 · 2023-08-06 15:20:29 -07:00 · 2023-08-05 13:19:51 -07:00 · 2023-08-04 18:28:03 -07:00 · 2023-07-29 19:20:34 -07:00
15 changed files with 122 additions and 51 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -19,57 +19,80 @@ jobs:
        include:
          - toolset: gcc-4.8
            cxxstd: "03,11"
-            os: ubuntu-18.04
-            install: g++-4.8
+            os: ubuntu-latest
+            container: ubuntu:18.04
+            install: g++-4.8-multilib
+            address-model: 32,64
          - toolset: gcc-5
            cxxstd: "03,11,14,1z"
-            os: ubuntu-18.04
-            install: g++-5
+            os: ubuntu-latest
+            container: ubuntu:18.04
+            install: g++-5-multilib
+            address-model: 32,64
          - toolset: gcc-6
            cxxstd: "03,11,14,1z"
-            os: ubuntu-18.04
-            install: g++-6
+            os: ubuntu-latest
+            container: ubuntu:18.04
+            install: g++-6-multilib
+            address-model: 32,64
          - toolset: gcc-7
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
+            install: g++-7-multilib
+            address-model: 32,64
          - toolset: gcc-8
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-            install: g++-8
+            os: ubuntu-20.04
+            install: g++-8-multilib
+            address-model: 32,64
          - toolset: gcc-9
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
+            install: g++-9-multilib
+            address-model: 32,64
          - toolset: gcc-10
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
+            install: g++-10-multilib
+            address-model: 32,64
          - toolset: gcc-11
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "03,11,14,17,20"
            os: ubuntu-20.04
-            install: g++-11
+            install: g++-11-multilib
+            address-model: 32,64
+          - toolset: gcc-12
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install: g++-12-multilib
+            address-model: 32,64
          - toolset: clang
            compiler: clang++-3.9
            cxxstd: "03,11,14"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install: clang-3.9
          - toolset: clang
            compiler: clang++-4.0
            cxxstd: "03,11,14"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install: clang-4.0
          - toolset: clang
            compiler: clang++-5.0
            cxxstd: "03,11,14,1z"
-            os: ubuntu-18.04
+            os: ubuntu-latest
+            container: ubuntu:18.04
            install: clang-5.0
          - toolset: clang
            compiler: clang++-6.0
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-20.04
            install: clang-6.0
          - toolset: clang
            compiler: clang++-7
            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
+            os: ubuntu-20.04
            install: clang-7
          - toolset: clang
            compiler: clang++-8
@ -85,40 +108,72 @@ jobs:
            compiler: clang++-10
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
-            install: clang-10
          - toolset: clang
            compiler: clang++-11
            cxxstd: "03,11,14,17,2a"
            os: ubuntu-20.04
-            install: clang-11
          - toolset: clang
            compiler: clang++-12
-            cxxstd: "03,11,14,17,2a"
+            cxxstd: "03,11,14,17,20"
            os: ubuntu-20.04
-            install: clang-12
+          - toolset: clang
+            compiler: clang++-13
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install: clang-13
+          - toolset: clang
+            compiler: clang++-14
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-22.04
+            install: clang-14
          - toolset: clang
            cxxstd: "03,11,14,17,2a"
-            os: macos-10.15
+            os: macos-11
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-12

    runs-on: ${{matrix.os}}
+    container: ${{matrix.container}}
+
+    defaults:
+      run:
+        shell: bash

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
+      - name: Setup container environment
+        if: matrix.container
+        run: |
+          apt-get update
+          apt-get -y install sudo python git g++

      - name: Install packages
        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ${{matrix.install}}

      - name: Setup Boost
        run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
          cd ..
          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
          cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/exception
+          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" exception
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
          ./bootstrap.sh
          ./b2 -d0 headers

@ -130,21 +185,29 @@ jobs:
      - name: Run tests
        run: |
          cd ../boost-root
-          ./b2 -j3 libs/exception/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release exception-handling=on,off rtti=on,off link=static,shared visibility=hidden,global
+          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release exception-handling=on,off rtti=on,off link=static,shared visibility=hidden,global

  windows:
    strategy:
      fail-fast: false
      matrix:
        include:
-          - toolset: msvc-14.1
-            cxxstd: "14,17,latest"
-            addrmd: 32,64
-            os: windows-2016
-          - toolset: msvc-14.2
-            cxxstd: "14,17,latest"
+          - toolset: msvc-14.0
+            cxxstd: 14,latest
            addrmd: 32,64
            os: windows-2019
+          - toolset: msvc-14.2
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2019
+          - toolset: msvc-14.3
+            cxxstd: "14,17,20,latest"
+            addrmd: 32,64
+            os: windows-2022
+          - toolset: clang-win
+            cxxstd: "14,17,latest"
+            addrmd: 32,64
+            os: windows-2022
          - toolset: gcc
            cxxstd: "03,11,14,17,2a"
            addrmd: 64
@ -153,20 +216,27 @@ jobs:
    runs-on: ${{matrix.os}}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Setup Boost
        shell: cmd
        run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
          set BOOST_BRANCH=develop
-          if "%GITHUB_BASE_REF%" == "master" set BOOST_BRANCH=master
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
          cd ..
          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
          cd boost-root
-          xcopy /s /e /q %GITHUB_WORKSPACE% libs\exception\
+          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" exception
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
          cmd /c bootstrap
          b2 -d0 headers

@ -174,4 +244,5 @@ jobs:
        shell: cmd
        run: |
          cd ../boost-root
-          b2 -j3 libs/exception/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release exception-handling=on,off rtti=on,off
+          b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release exception-handling=on,off rtti=on,off embed-manifest-via=linker
+
--- a/include/boost/exception/current_exception_cast.hpp
+++ b/include/boost/exception/current_exception_cast.hpp
@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_7E83C166200811DE885E826156D89593

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/clone_current_exception.hpp
+++ b/include/boost/exception/detail/clone_current_exception.hpp
@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_81522C0EB56511DFAB613DB0DFD72085

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/error_info_impl.hpp
+++ b/include/boost/exception/detail/error_info_impl.hpp
@ -14,7 +14,7 @@
 #include <string>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@ -26,7 +26,7 @@
 #include <stdlib.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/is_output_streamable.hpp
+++ b/include/boost/exception/detail/is_output_streamable.hpp
@ -9,7 +9,7 @@
 #include <ostream>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/object_hex_dump.hpp
+++ b/include/boost/exception/detail/object_hex_dump.hpp
@ -14,7 +14,7 @@
 #include <cstdlib>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/type_info.hpp
+++ b/include/boost/exception/detail/type_info.hpp
@ -14,7 +14,7 @@
 #include <string.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/diagnostic_information.hpp
+++ b/include/boost/exception/diagnostic_information.hpp
@ -21,7 +21,7 @@
 #endif

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/errinfo_errno.hpp
+++ b/include/boost/exception/errinfo_errno.hpp
@ -11,7 +11,7 @@
 #include <string.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/get_error_info.hpp
+++ b/include/boost/exception/get_error_info.hpp
@ -14,7 +14,7 @@
 #include <boost/assert.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/info.hpp
+++ b/include/boost/exception/info.hpp
@ -14,7 +14,7 @@
 #include <map>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/info_tuple.hpp
+++ b/include/boost/exception/info_tuple.hpp
@ -10,7 +10,7 @@
 #include <boost/tuple/tuple.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/to_string.hpp
+++ b/include/boost/exception/to_string.hpp
@ -11,7 +11,7 @@
 #include <sstream>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/to_string_stub.hpp
+++ b/include/boost/exception/to_string_stub.hpp
@ -11,7 +11,7 @@
 #include <boost/assert.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
Author	SHA1	Message	Date
Peter Dimov	ad15fefae7	Avoid -Wundef warnings	2024-01-06 16:30:15 +02:00
Emil Dotchevski	11f102a987	Revert "Don't double-rethrow std::exception_ptr (#53 )" This reverts commit `ea70868a45`.	2023-08-06 15:20:29 -07:00
Emil Dotchevski	fe23c01a93	Added sudo apt-get update before sudo apt-get install (#54 ) * Added sudo apt-get update before sudo apt-get install * Update gha	2023-08-05 13:19:51 -07:00
Ed Catmur	ea70868a45	Don't double-rethrow std::exception_ptr (#53 ) It's unnecessary to throw and then rethrow std::exception_ptr, just derive clone_base separately. nb. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110835	2023-08-04 18:28:03 -07:00
Emil Dotchevski	03aa58e06e	GHA	2023-07-29 19:20:34 -07:00
Emil Dotchevski	0d69599d91	GHA update	2023-07-29 18:08:17 -07:00
Emil Dotchevski	652e8e01d2	GHA updates	2023-07-29 17:47:11 -07:00