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 #include #include -#include #include +#include 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 #include +#include +#include + #include #include #include @@ -31,8 +34,14 @@ #include #include -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 template using SplitRingBufferSinkMt = SplitRingBufferSink; -} // 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 - #include #include