fix macos build when exceptions disabled

odygrd · Nov 20, 2023 · ed934b5 · ed934b5
1 parent dcfd8d1
commit ed934b5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@
 - Reduce backend worker unnecessary allocation. ([#368](https://github.com/odygrd/quill/issues/368))
 - Adjusted handling for empty `std::string_view` instances, addressing an issue where logging empty strings triggered an
   unintended `memcpy` with zero size and a nullptr, leading to address sanitizer warnings.
+- Fix build error on macOS when using '-DQUILL_NO_EXCEPTIONS:BOOL=ON'. ([#357](https://github.com/odygrd/quill/issues/357))
 
 ## v3.4.0
 

diff --git a/benchmarks/hot_path_latency/hot_path_bench.h b/benchmarks/hot_path_latency/hot_path_bench.h
@@ -18,6 +18,8 @@
 #include <random>
 #include <thread>
 
+#include <x86intrin.h>
+
 // Instead of sleep
 inline void wait(std::chrono::nanoseconds min, std::chrono::nanoseconds max)
 {

diff --git a/quill/include/quill/QuillError.h b/quill/include/quill/QuillError.h
@@ -8,10 +8,22 @@
 #include "quill/TweakMe.h"
 
 #include "quill/detail/misc/Attributes.h"
-#include "quill/detail/misc/Common.h"
 #include <exception>
 #include <string>
 
+/**
+ * Require check
+ */
+#define QUILL_REQUIRE(expression, error)                                                           \
+  do                                                                                               \
+  {                                                                                                \
+    if (QUILL_UNLIKELY(!(expression)))                                                             \
+    {                                                                                              \
+      printf("Quill fatal error: %s (%s:%d)\n", error, __FILE__, __LINE__);                        \
+      std::abort();                                                                                \
+    }                                                                                              \
+  } while (0)
+
 #if defined(QUILL_NO_EXCEPTIONS)
   #define QUILL_TRY if (true)
   #define QUILL_THROW(ex) QUILL_REQUIRE(false, ex.what())

diff --git a/quill/include/quill/detail/misc/Common.h b/quill/include/quill/detail/misc/Common.h
@@ -7,8 +7,9 @@
 
 #include "quill/TweakMe.h"
 
-#include "quill/detail/misc/Attributes.h"
 #include "quill/Fmt.h"
+#include "quill/QuillError.h"
+#include "quill/detail/misc/Attributes.h"
 #include <functional>
 #include <sstream>
 #include <string>
@@ -76,19 +77,6 @@ enum class QueueType
   #define QUILL_UNLIKELY(x) (x)
 #endif
 
-/**
- * Require check
- */
-#define QUILL_REQUIRE(expression, error)                                                           \
-  do                                                                                               \
-  {                                                                                                \
-    if (QUILL_UNLIKELY(!(expression)))                                                             \
-    {                                                                                              \
-      printf("Quill fatal error: %s (%s:%d)\n", error, __FILE__, __LINE__);                        \
-      std::abort();                                                                                \
-    }                                                                                              \
-  } while (0)
-
 namespace quill
 {
 namespace detail
@@ -191,8 +179,8 @@ constexpr bool check_printf_format_string(S format_str)
 
   if (num_specifiers > sizeof...(Args))
   {
-    throw std::runtime_error{
-      "Invalid printf format: format string does not match number of arguments"};
+    QUILL_THROW(
+      QuillError{"Invalid printf format: format string does not match number of arguments"});
   }
 
   return true;