zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-12-16 03:08:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #233 from Esonhugh/master

Browse Source 
fix issue #231
This commit is contained in:
Toru Niina
2024-01-05 01:39:23 +09:00
committed by GitHub
parent 1dd15ffa26 7bd09245fa
commit 1bb5284eb5
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
.github/workflows/main.yml vendored
View File

@@ -138,6 +138,56 @@ jobs:
run: | run: |
cd build && ctest --output-on-failure 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: build-osx-12:
runs-on: macos-12 runs-on: macos-12
strategy: strategy:

4
toml/exception.hpp
View File

@@ -37,13 +37,13 @@ inline std::string str_error(int errnum)
{ {
return std::string(buf.data()); 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; constexpr std::size_t bufsize = 256;
std::array<char, bufsize> buf; std::array<char, bufsize> buf;
buf.fill('\0'); buf.fill('\0');
const char* result = strerror_r(errnum, buf.data(), bufsize); const char* result = strerror_r(errnum, buf.data(), bufsize);
return std::string(result); 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; constexpr std::size_t bufsize = 256;
std::array<char, bufsize> buf; std::array<char, bufsize> buf;
buf.fill('\0'); buf.fill('\0');