diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 566a63e..4126385 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,6 +138,56 @@ jobs: run: | cd build && ctest --output-on-failure +# build-osx-13-arm64: +# runs-on: macos-13-arm64 +# strategy: +# matrix: +# standard: ['11', '14', '17', '20'] +# unreleased: ['ON', 'OFF'] +# steps: +# - name: Checkout +# uses: actions/checkout@v3 +# with: +# submodules: true +# - name: Install +# run: | +# brew install boost +# - name: Configure +# run: | +# mkdir build && cd build +# cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }} +# - name: Build +# run: | +# cd build && cmake --build . +# - name: Test +# run: | +# cd build && ctest --output-on-failure + + build-osx-13: + runs-on: macos-13 + strategy: + matrix: + standard: ['11', '14', '17', '20'] + unreleased: ['ON', 'OFF'] + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + submodules: true + - name: Install + run: | + brew install boost + - name: Configure + run: | + mkdir build && cd build + cmake .. -Dtoml11_BUILD_TEST=ON -DCMAKE_CXX_STANDARD=${{ matrix.standard }} -DTOML11_USE_UNRELEASED_TOML_FEATURES=${{ matrix.unreleased }} + - name: Build + run: | + cd build && cmake --build . + - name: Test + run: | + cd build && ctest --output-on-failure + build-osx-12: runs-on: macos-12 strategy: diff --git a/toml/exception.hpp b/toml/exception.hpp index 927d791..81c6401 100644 --- a/toml/exception.hpp +++ b/toml/exception.hpp @@ -37,13 +37,13 @@ inline std::string str_error(int errnum) { return std::string(buf.data()); } -#elif defined(_GNU_SOURCE) +#elif defined(_GNU_SOURCE) && !(defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200112L ) constexpr std::size_t bufsize = 256; std::array buf; buf.fill('\0'); const char* result = strerror_r(errnum, buf.data(), bufsize); return std::string(result); -#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) +#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) || ( defined(__DARWIN_C_LEVEL) && __DARWIN_C_LEVEL >= 200112L ) // macOS constexpr std::size_t bufsize = 256; std::array buf; buf.fill('\0');