From 9cfa5ff4a002596885d0fcadfe9dcd5b7a0bf496 Mon Sep 17 00:00:00 2001 From: Joao Paulo Magalhaes Date: Wed, 12 Feb 2025 23:24:13 +0000 Subject: [PATCH] fix warnings from -Wundef --- .github/workflows/ubuntu24.yml | 26 ++++++++++++++++---------- benchmarks/event_counter.h | 2 +- include/fast_float/float_common.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ubuntu24.yml b/.github/workflows/ubuntu24.yml index 8da4c5f..3dad9dd 100644 --- a/.github/workflows/ubuntu24.yml +++ b/.github/workflows/ubuntu24.yml @@ -9,15 +9,21 @@ jobs: - uses: actions/checkout@v4 - name: Use cmake run: | - mkdir build && - cd build && - CXXFLAGS=-Werror cmake -DFASTFLOAT_TEST=ON -D FASTFLOAT_BENCHMARKS=ON .. && - cmake --build . && - ctest --output-on-failure + set -xe + cmake -B build \ + -DFASTFLOAT_TEST=ON \ + -DFASTFLOAT_BENCHMARKS=ON \ + -DCMAKE_CXX_FLAGS=' -Werror -Wundef ' + cmake --build build --parallel + ( cd build ; ctest --output-on-failure ) - name: Use cmake CXX23 run: | - mkdir build20 && - cd build20 && - CXXFLAGS=-Werror cmake -DFASTFLOAT_CONSTEXPR_TESTS=ON -DFASTFLOAT_FIXEDWIDTH_TESTS=ON -DFASTFLOAT_CXX_STANDARD=23 -DFASTFLOAT_TEST=ON .. && - cmake --build . && - ctest --output-on-failure \ No newline at end of file + set -xe + cmake -B build20 \ + -DFASTFLOAT_TEST=ON \ + -DFASTFLOAT_CONSTEXPR_TESTS=ON \ + -DFASTFLOAT_FIXEDWIDTH_TESTS=ON \ + -DFASTFLOAT_CXX_STANDARD=23 \ + -DCMAKE_CXX_FLAGS=' -Werror -Wundef ' + cmake --build build20 --parallel + ( cd build20 ; ctest --output-on-failure ) diff --git a/benchmarks/event_counter.h b/benchmarks/event_counter.h index 22cc513..cd59478 100644 --- a/benchmarks/event_counter.h +++ b/benchmarks/event_counter.h @@ -17,7 +17,7 @@ #include #endif -#if __APPLE__ && __aarch64__ +#if (defined(__APPLE__) && __APPLE__) && (defined(__aarch64__) && __aarch64__) #include "apple_arm_events.h" #endif diff --git a/include/fast_float/float_common.h b/include/fast_float/float_common.h index ef499ce..2d2afca 100644 --- a/include/fast_float/float_common.h +++ b/include/fast_float/float_common.h @@ -9,7 +9,7 @@ #include #include #ifdef __has_include -#if __has_include() && (__cplusplus > 202002L || _MSVC_LANG > 202002L) +#if __has_include() && (__cplusplus > 202002L || (defined(_MSVC_LANG) && (_MSVC_LANG > 202002L))) #include #endif #endif