fix: hotfixes

Signed-off-by: Dmitriy Khaustov aka xDimon <khaustov.dm@gmail.com>
xDimon · Feb 6, 2024 · 58a60b3 · 58a60b3
1 parent 35cc23e
commit 58a60b3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 89 deletions.
diff --git a/include/soralog/common.hpp b/include/soralog/common.hpp
diff --git a/include/soralog/event.hpp b/include/soralog/event.hpp
@@ -15,7 +15,6 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
-#include <soralog/common.hpp>
 #include <soralog/level.hpp>
 #include <soralog/sink.hpp>
 #include <soralog/util.hpp>

diff --git a/include/soralog/sink.hpp b/include/soralog/sink.hpp
@@ -14,7 +14,6 @@
 #include <fmt/format.h>
 
 #include <soralog/circular_buffer.hpp>
-#include <soralog/common.hpp>
 #include <soralog/event.hpp>
 
 #ifdef NDEBUG
@@ -24,7 +23,7 @@
 #endif
 
 #if not defined(likely_if)
-#if __cplusplus > 201703L
+#if __cplusplus >= 202002L
 #define likely_if(x) [[likely]] if (x)
 #elif defined(__has_builtin)
 #if __has_builtin(__builtin_expect)

diff --git a/src/impl/sink_to_console.cpp b/src/impl/sink_to_console.cpp
@@ -15,8 +15,6 @@
 #include <fmt/color.h>
 #include <fmt/format.h>
 
-#include <soralog/common.hpp>
-
 namespace soralog {
 
   namespace {

diff --git a/test/unit/circular_buffer_test.cpp b/test/unit/circular_buffer_test.cpp
@@ -7,8 +7,8 @@
 
 #include <gtest/gtest.h>
 
-#if __cplusplus > 201703L
-#include <barrier>
+#if __cplusplus >= 202002L
+#include <latch>
 #endif
 
 #include "soralog/impl/sink_to_file.hpp"
@@ -159,13 +159,13 @@ TEST_F(CircularBufferTest, PutGetMt) {
   std::atomic_size_t i = 0;
   std::atomic_size_t n = 100;
 
-#if __cplusplus > 201703L
-  std::barrier barrier(3);
+#if __cplusplus >= 202002L
+  std::latch latch(3);
 #endif
 
   std::thread prod([&] {
-#if __cplusplus > 201703L
-    barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+    latch.arrive_and_wait();
 #endif
     while (i < n) {
       std::cout << "w" << i << std::endl;
@@ -181,8 +181,8 @@ TEST_F(CircularBufferTest, PutGetMt) {
   });
 
   std::thread cons([&] {
-#if __cplusplus > 201703L
-    barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+    latch.arrive_and_wait();
 #endif
     while (i < n) {
       std::cout << "r" << std::endl;
@@ -195,8 +195,8 @@ TEST_F(CircularBufferTest, PutGetMt) {
     }
   });
 
-#if __cplusplus > 201703L
-  barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+  latch.arrive_and_wait();
 #endif
   prod.join();
   cons.join();
@@ -207,13 +207,13 @@ TEST_F(CircularBufferTest, Mutual) {
 
   CircularBuffer<Data> testee(capacity);
 
-#if __cplusplus > 201703L
-  std::barrier barrier(3);
+#if __cplusplus >= 202002L
+  std::latch latch(3);
 #endif
 
   std::thread prod([&] {
-#if __cplusplus > 201703L
-    barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+    latch.arrive_and_wait();
 #endif
     if (auto ref = testee.put('*')) {
       std::cout << "put " << ref->c()  //
@@ -224,8 +224,8 @@ TEST_F(CircularBufferTest, Mutual) {
   });
 
   std::thread cons([&] {
-#if __cplusplus > 201703L
-    barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+    latch.arrive_and_wait();
 #endif
     std::this_thread::sleep_for(std::chrono::milliseconds(50));
     if (auto ref = testee.get()) {
@@ -235,8 +235,8 @@ TEST_F(CircularBufferTest, Mutual) {
     }
   });
 
-#if __cplusplus > 201703L
-  barrier.arrive_and_wait();
+#if __cplusplus >= 202002L
+  latch.arrive_and_wait();
 #endif
   prod.join();
   cons.join();

diff --git a/test/unit/macros_test.cpp b/test/unit/macros_test.cpp
@@ -21,7 +21,7 @@ class MacrosTest : public ::testing::Test {
     void log(Level lvl, const Format &format, Args &&...args) {
       last_level = lvl;
       size_t len =
-          fmt::vformat_to_n(
+          ::fmt::vformat_to_n(
               message_buf.begin(), message_buf.size(),
               ::fmt::detail_exported::compile_string_to_view<char>(format),
               ::fmt::make_format_args(args...))

diff --git a/test/unit/sink_to_console_test.cpp b/test/unit/sink_to_console_test.cpp
@@ -9,7 +9,9 @@
 
 #include "soralog/impl/sink_to_console.hpp"
 
+#if __cplusplus >= 202002L
 #include <latch>
+#endif
 
 using namespace soralog;
 using namespace testing;
@@ -116,10 +118,14 @@ TEST_F(SinkToConsoleTest, MultithreadLogging) {
   size_t treads_n = 10;
   size_t iters_n = 100;
 
+#if __cplusplus >= 202002L
   std::latch latch(treads_n);
+#endif
 
   auto task = [&] {
+#if __cplusplus >= 202002L
     latch.arrive_and_wait();
+#endif
     std::mutex m;
     for (auto i = 0; i < iters_n; ++i) {
       logger->debug("iteration {}.1", i);