commit f63bde80e20afb7f74dd12bf62b9a019e1b80e1c
author Stephan Pleines <pleines.stephan@gmail.com> Sat Jan 13 15:59:33 2024 -0800
committer Stephan Pleines <pleines.stephan@gmail.com> Fri Jan 19 18:06:09 2024 -0800
tree e485ef4a1d17d6195afba27dc30a583ec1c4ad68
parent d52f12d58b38919209076dfdff1b8292857bfa47

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

aos/starter/mock_starter.cc

diff --git a/aos/starter/mock_starter.cc b/aos/starter/mock_starter.cc
index 9f9a2b5..541e17f 100644
--- a/aos/starter/mock_starter.cc
+++ b/aos/starter/mock_starter.cc
@@ -1,7 +1,6 @@
 #include "aos/starter/mock_starter.h"
 
-namespace aos {
-namespace starter {
+namespace aos::starter {
 
 MockStarter::MockStarter(aos::EventLoop *event_loop)
     : event_loop_(event_loop),
@@ -119,5 +118,4 @@
   }
 }
 
-}  // namespace starter
-}  // namespace aos
+}  // namespace aos::starter

aos/starter/starter_rpc_lib.cc

diff --git a/aos/starter/starter_rpc_lib.cc b/aos/starter/starter_rpc_lib.cc
index 4e9ceef..891355e 100644
--- a/aos/starter/starter_rpc_lib.cc
+++ b/aos/starter/starter_rpc_lib.cc
@@ -6,8 +6,7 @@
 #include "aos/flatbuffer_merge.h"
 #include "aos/starter/starterd_lib.h"
 
-namespace aos {
-namespace starter {
+namespace aos::starter {
 
 namespace {
 State ExpectedStateForCommand(Command command) {
@@ -307,5 +306,4 @@
                    status_fetcher.CopyFlatBuffer()));
 }
 
-}  // namespace starter
-}  // namespace aos
+}  // namespace aos::starter

aos/starter/starter_test.cc

diff --git a/aos/starter/starter_test.cc b/aos/starter/starter_test.cc
index e68cf05..d26f414 100644
--- a/aos/starter/starter_test.cc
+++ b/aos/starter/starter_test.cc
@@ -17,8 +17,7 @@
 
 using aos::testing::ArtifactPath;
 
-namespace aos {
-namespace starter {
+namespace aos::starter {
 
 class ThreadedStarterRunner {
  public:
@@ -572,5 +571,4 @@
   ASSERT_FALSE(starter.event_loop()->is_running());
 }
 
-}  // namespace starter
-}  // namespace aos
+}  // namespace aos::starter

aos/starter/starterd_lib.cc

diff --git a/aos/starter/starterd_lib.cc b/aos/starter/starterd_lib.cc
index bf0fc31..95210c0 100644
--- a/aos/starter/starterd_lib.cc
+++ b/aos/starter/starterd_lib.cc
@@ -20,8 +20,7 @@
               "Number of threads to spin up to initialize the queue.  0 means "
               "use the main thread.");
 
-namespace aos {
-namespace starter {
+namespace aos::starter {
 
 const aos::Channel *StatusChannelForNode(const aos::Configuration *config,
                                          const aos::Node *node) {
@@ -315,5 +314,4 @@
           << shm_base_;
 }
 
-}  // namespace starter
-}  // namespace aos
+}  // namespace aos::starter