Tweak CI script.

This commit is contained in:
jzmaddock
2022-12-12 18:06:45 +00:00
parent 99653df37d
commit 86b2fbe600
2 changed files with 5 additions and 5 deletions

View File

@ -64,8 +64,8 @@ jobs:
- name: Test - name: Test
run: ../../../b2 toolset=$TOOLSET run: ../../../b2 toolset=$TOOLSET
working-directory: ../boost-root/libs/regex/test working-directory: ../boost-root/libs/regex/test
ubuntu-focal-standalone: ubuntu-jammy-standalone:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -87,7 +87,7 @@ jobs:
- name: Install packages - name: Install packages
run: sudo apt install g++-9 g++-10 run: sudo apt install g++-9 g++-10
- name: Test - name: Test
run: ${{ matrix.compiler }} -std=${{ matrix.standard }} -I../../include *.cpp ../../src/*.cpp -o regress -licuuc -licudata -licui18n && ./regress run: ${{ matrix.compiler }} -std=${{ matrix.standard }} -I../../include *.cpp ../../src/*.cpp -o regress -licuuc -licui18n && ./regress
working-directory: ./test/regress working-directory: ./test/regress
ubuntu-bionic: ubuntu-bionic:
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04

View File

@ -180,7 +180,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
// We're converting an integer i to a string, and since i <= REG_E_UNKNOWN // We're converting an integer i to a string, and since i <= REG_E_UNKNOWN
// a five character string is *always* large enough: // a five character string is *always* large enough:
// //
#if BOOST_CXX_VERSION >= 201103 #if !defined(BOOST_CXX_VERSION) || (BOOST_CXX_VERSION >= 201103)
int r = (std::snprintf)(localbuf, 5, "%d", i); int r = (std::snprintf)(localbuf, 5, "%d", i);
#elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE) #elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
int r = (::sprintf_s)(localbuf, 5, "%d", i); int r = (::sprintf_s)(localbuf, 5, "%d", i);
@ -194,7 +194,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
return std::strlen(localbuf) + 1; return std::strlen(localbuf) + 1;
} }
} }
#if BOOST_CXX_VERSION >= 201103 #if !defined(BOOST_CXX_VERSION) || (BOOST_CXX_VERSION >= 201103)
int r = (::snprintf)(localbuf, 5, "%d", 0); int r = (::snprintf)(localbuf, 5, "%d", 0);
#elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE) #elif BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(_WIN32_WCE) && !defined(UNDER_CE)
int r = (::sprintf_s)(localbuf, 5, "%d", 0); int r = (::sprintf_s)(localbuf, 5, "%d", 0);