Merge pull request #280 from anarthal/feature/remove-borland-config

Removes non-existing boost/regex/config/borland.hpp include from config.hpp

.github/workflows/ci.yml

@@ -15,12 +15,16 @@ on:
   release:
     types: [published, created, edited]
 
+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
+
 env:
   UBSAN_OPTIONS: print_stacktrace=1
 
 jobs:
   ubuntu-jammy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -32,8 +36,6 @@ jobs:
           fetch-depth: '0'
       - name: Set TOOLSET
         run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
         run: sudo apt install g++-11 g++-12 g++-13
       - name: Checkout main boost
@@ -75,8 +77,6 @@ jobs:
           fetch-depth: '0'
       - name: Set TOOLSET
         run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
         run: sudo apt install libicu-dev
       - name: Test
@@ -95,8 +95,6 @@ jobs:
           fetch-depth: '0'
       - name: Set TOOLSET
         run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
         run: sudo apt install clang-15
       - name: Checkout main boost
@@ -126,7 +124,7 @@ jobs:
         run: ../../../b2 toolset=$TOOLSET define=CI_SUPPRESS_KNOWN_ISSUES define=SLOW_COMPILER
         working-directory: ../boost-root/libs/regex/test
   ubuntu-jammy-clang-18-modules:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
         with:
@@ -168,8 +166,6 @@ jobs:
           fetch-depth: '0'
       - name: Set TOOLSET
         run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
-      - name: Add repository
-        run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
         run: sudo apt install clang-16 clang-17 clang-18
       - name: Checkout main boost

include/boost/regex/config.hpp

@@ -37,14 +37,6 @@
 #define BOOST_REGEX_STANDALONE
 #endif
 
-/*
- * Borland C++ Fix/error check
- * this has to go *before* we include any std lib headers:
- */
-#if defined(__BORLANDC__) && !defined(__clang__)
-#  include <boost/regex/config/borland.hpp>
-#endif
-
 #ifndef BOOST_REGEX_STANDALONE
 #include <boost/version.hpp>
 #endif