From 0ac9ddddfbbb69582af2af3e5e7610b178924ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= <caguero@openrobotics.org>
Date: Mon, 19 Aug 2024 15:23:41 +0200
Subject: [PATCH] Tweaks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
---
 log/include/gz/utils/log/Logger.hh    |  4 ++--
 log/include/gz/utils/log/SplitSink.hh | 17 +++++++++++++++--
 log/src/SplitSink_TEST.cc             |  1 -
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/log/include/gz/utils/log/Logger.hh b/log/include/gz/utils/log/Logger.hh
index 54e4958..3e3a491 100644
--- a/log/include/gz/utils/log/Logger.hh
+++ b/log/include/gz/utils/log/Logger.hh
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 #include <gz/utils/config.hh>
-#include <gz/utils/Export.hh>
 #include <gz/utils/ImplPtr.hh>
+#include <gz/utils/log/Export.hh>
 
 namespace gz
 {
@@ -60,7 +60,7 @@ class GZ_UTILS_LOG_VISIBLE Logger
   /// \brief Implementation Pointer.
   GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr)
 };
-}  // namespace GZ_UTILS_VERSION_NAMESPACE
+}  // namespace GZ_UTILS_LOG_VERSION_NAMESPACE
 }  // namespace log
 }  // namespace utils
 }  // namespace gz
diff --git a/log/include/gz/utils/log/SplitSink.hh b/log/include/gz/utils/log/SplitSink.hh
index d531811..92b7235 100644
--- a/log/include/gz/utils/log/SplitSink.hh
+++ b/log/include/gz/utils/log/SplitSink.hh
@@ -24,6 +24,9 @@
 #include <utility>
 #include <vector>
 
+#include <gz/utils/config.hh>
+#include <gz/utils/log/Export.hh>
+
 #include <spdlog/details/log_msg.h>
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/pattern_formatter.h>
@@ -31,8 +34,14 @@
 #include <spdlog/sinks/ringbuffer_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 
-namespace gz::utils::log
+namespace gz
+{
+namespace utils
+{
+namespace log
 {
+inline namespace GZ_UTILS_LOG_VERSION_NAMESPACE {
+
 /// \brief Logging sink for spdlog that logs in Gazebo-conventions.
 ///
 /// This will route messages with severity (warn, err, critical) to stderr,
@@ -207,5 +216,9 @@ class SplitRingBufferSink: public spdlog::sinks::base_sink<Mutex>
 template <size_t numItems>
 using SplitRingBufferSinkMt = SplitRingBufferSink<std::mutex, numItems>;
 
-}  // namespace gz::utils::log
+}  // namespace GZ_UTILS_LOG_VERSION_NAMESPACE
+}  // namespace log
+}  // namespace utils
+}  // namespace gz
+
 #endif  // GZ_UTILS_LOG_SPLITSINK_HH__
diff --git a/log/src/SplitSink_TEST.cc b/log/src/SplitSink_TEST.cc
index 4b19abe..284fe02 100644
--- a/log/src/SplitSink_TEST.cc
+++ b/log/src/SplitSink_TEST.cc
@@ -16,7 +16,6 @@
  */
 
 #include <gtest/gtest.h>
-
 #include <spdlog/logger.h>
 #include <gz/utils/log/SplitSink.hh>