Nest all namespaces
The compiler supports this now. We can type less going forward.
No functional changes.
Signed-off-by: Stephan Pleines <pleines.stephan@gmail.com>
Change-Id: I29d6fa4f9aacc0e381f1a7637294db0392466995
diff --git a/aos/logging/context.cc b/aos/logging/context.cc
index d1a6b03..5e5d53c 100644
--- a/aos/logging/context.cc
+++ b/aos/logging/context.cc
@@ -22,9 +22,7 @@
#include "aos/logging/implementations.h"
-namespace aos {
-namespace logging {
-namespace internal {
+namespace aos::logging::internal {
namespace {
// TODO(brians): Differentiate between threads with the same name in the same
@@ -114,6 +112,4 @@
delete_current_context = false;
}
-} // namespace internal
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging::internal
diff --git a/aos/logging/dynamic_logging.cc b/aos/logging/dynamic_logging.cc
index 1120a94..a3461b5 100644
--- a/aos/logging/dynamic_logging.cc
+++ b/aos/logging/dynamic_logging.cc
@@ -2,8 +2,7 @@
#include "glog/logging.h"
-namespace aos {
-namespace logging {
+namespace aos::logging {
DynamicLogging::DynamicLogging(aos::EventLoop *event_loop)
: application_name_(event_loop->name()) {
@@ -31,5 +30,4 @@
FLAGS_v = command.vlog_level();
}
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging
diff --git a/aos/logging/dynamic_logging_test.cc b/aos/logging/dynamic_logging_test.cc
index 9b78113..70e491d 100644
--- a/aos/logging/dynamic_logging_test.cc
+++ b/aos/logging/dynamic_logging_test.cc
@@ -11,9 +11,7 @@
using aos::testing::ArtifactPath;
-namespace aos {
-namespace logging {
-namespace testing {
+namespace aos::logging::testing {
namespace chrono = std::chrono;
@@ -90,6 +88,4 @@
}
}
-} // namespace testing
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging::testing
diff --git a/aos/logging/implementations.cc b/aos/logging/implementations.cc
index 3b4f905..da9e72b 100644
--- a/aos/logging/implementations.cc
+++ b/aos/logging/implementations.cc
@@ -8,8 +8,7 @@
#include "aos/logging/printf_formats.h"
#include "aos/time/time.h"
-namespace aos {
-namespace logging {
+namespace aos::logging {
namespace internal {
namespace {
@@ -83,5 +82,4 @@
return context->implementation;
}
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging
diff --git a/aos/logging/implementations_test.cc b/aos/logging/implementations_test.cc
index d08f85f..693a91e 100644
--- a/aos/logging/implementations_test.cc
+++ b/aos/logging/implementations_test.cc
@@ -14,9 +14,7 @@
using ::testing::AssertionResult;
using ::testing::AssertionSuccess;
-namespace aos {
-namespace logging {
-namespace testing {
+namespace aos::logging::testing {
namespace chrono = ::std::chrono;
@@ -241,6 +239,4 @@
ASSERT_EQ(curr_impl, GetImplementation().get());
}
-} // namespace testing
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging::testing
diff --git a/aos/logging/interface.cc b/aos/logging/interface.cc
index 233357d..e0ce6a8 100644
--- a/aos/logging/interface.cc
+++ b/aos/logging/interface.cc
@@ -12,8 +12,7 @@
#include "aos/logging/context.h"
#include "aos/logging/implementations.h"
-namespace aos {
-namespace logging {
+namespace aos::logging {
namespace internal {
size_t ExecuteFormat(char *output, size_t output_size, const char *format,
@@ -62,8 +61,7 @@
}
}
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging
void log_do(log_level level, const char *format, ...) {
va_list ap;
diff --git a/aos/logging/log_namer.cc b/aos/logging/log_namer.cc
index 4e9e00e..16ba0f2 100644
--- a/aos/logging/log_namer.cc
+++ b/aos/logging/log_namer.cc
@@ -33,8 +33,7 @@
"The folder to log to. If empty, search for the /media/sd*1/ "
"folder and place logs there.");
-namespace aos {
-namespace logging {
+namespace aos::logging {
namespace {
void AllocateLogName(char **filename, const char *directory,
const char *basename) {
@@ -187,5 +186,4 @@
return log_base_name.value();
}
-} // namespace logging
-} // namespace aos
+} // namespace aos::logging