From fe4e6ae5b702e75bb5366503b5befe1d75dcb277 Mon Sep 17 00:00:00 2001 From: 3manifold <22544721+3manifold@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:23:16 +0100 Subject: [PATCH 1/2] Improve compiler flags & CMake version compatibility --- CMakeLists.txt | 4 ++-- include/quill/core/BoundedSPSCQueue.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33a3de58..7d6a5b5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.10) project(quill) #------------------------------------------------------------------------------------------------------- @@ -298,7 +298,7 @@ target_include_directories(${TARGET_NAME} # Compiler options target_compile_options(${TARGET_NAME} INTERFACE - $<$,$>:-Wno-gnu-zero-variadic-macro-arguments>) + $<$,$>:-Wno-gnu-zero-variadic-macro-arguments -Wno-error=float-equal>) # Install if (QUILL_MASTER_PROJECT OR QUILL_ENABLE_INSTALL) diff --git a/include/quill/core/BoundedSPSCQueue.h b/include/quill/core/BoundedSPSCQueue.h index fd6a23d0..31dcb250 100644 --- a/include/quill/core/BoundedSPSCQueue.h +++ b/include/quill/core/BoundedSPSCQueue.h @@ -77,7 +77,7 @@ class BoundedSPSCQueueImpl integer_type reader_store_percent = 5) : _capacity(next_power_of_two(capacity)), _mask(_capacity - 1), - _bytes_per_batch(static_cast(_capacity * static_cast(reader_store_percent) / 100.0)), + _bytes_per_batch(static_cast(static_cast(_capacity * reader_store_percent) / 100.0)), _storage(static_cast(_alloc_aligned(2ull * static_cast(_capacity), CACHE_LINE_ALIGNED, huges_pages_enabled))), _huge_pages_enabled(huges_pages_enabled) From db49546703c1a3d6db484c5c412c56c5b8ffc685 Mon Sep 17 00:00:00 2001 From: 3manifold <22544721+3manifold@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:59:29 +0100 Subject: [PATCH 2/2] Update CMakeLists.txt Co-authored-by: Odysseas Georgoudis --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d6a5b5c..dfe2d741 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,7 +298,7 @@ target_include_directories(${TARGET_NAME} # Compiler options target_compile_options(${TARGET_NAME} INTERFACE - $<$,$>:-Wno-gnu-zero-variadic-macro-arguments -Wno-error=float-equal>) + $<$,$>:-Wno-gnu-zero-variadic-macro-arguments>) # Install if (QUILL_MASTER_PROJECT OR QUILL_ENABLE_INSTALL)