Nest some more namespaces
Did someone previously suggest that all namespace had been
nested? Silly.
Signed-off-by: Stephan Pleines <pleines.stephan@gmail.com>
Change-Id: I22278c1caaeba8b47dc46fb2ed3078c20a11e190
diff --git a/aos/starter/mock_starter.h b/aos/starter/mock_starter.h
index a0c1b76..212f1e5 100644
--- a/aos/starter/mock_starter.h
+++ b/aos/starter/mock_starter.h
@@ -6,8 +6,7 @@
#include "aos/starter/starter_rpc_generated.h"
#include "aos/starter/starterd_lib.h"
-namespace aos {
-namespace starter {
+namespace aos::starter {
// Simple mock of starterd that updates the starter status message to act as
// though applications are started and stopped when requested.
@@ -50,5 +49,4 @@
std::vector<std::unique_ptr<MockStarter>> mock_starters_;
};
-} // namespace starter
-} // namespace aos
+} // namespace aos::starter
diff --git a/aos/starter/starter_rpc_lib.h b/aos/starter/starter_rpc_lib.h
index eadf5c6..ae2450c 100644
--- a/aos/starter/starter_rpc_lib.h
+++ b/aos/starter/starter_rpc_lib.h
@@ -11,8 +11,7 @@
#include "aos/starter/starter_generated.h"
#include "aos/starter/starter_rpc_generated.h"
-namespace aos {
-namespace starter {
+namespace aos::starter {
// Data required to command that starter start/stop/restart a given application.
struct ApplicationCommand {
@@ -119,7 +118,6 @@
const aos::FlatbufferVector<aos::starter::Status>>>
GetStarterStatus(const aos::Configuration *config, const aos::Node *node);
-} // namespace starter
-} // namespace aos
+} // namespace aos::starter
#endif // AOS_STARTER_STARTER_RPC_LIB_H_
diff --git a/aos/starter/starterd_lib.h b/aos/starter/starterd_lib.h
index 92b20fa..3779c84 100644
--- a/aos/starter/starterd_lib.h
+++ b/aos/starter/starterd_lib.h
@@ -19,8 +19,7 @@
#include "aos/starter/subprocess.h"
#include "aos/util/top.h"
-namespace aos {
-namespace starter {
+namespace aos::starter {
const aos::Channel *StatusChannelForNode(const aos::Configuration *config,
const aos::Node *node);
@@ -107,7 +106,6 @@
DISALLOW_COPY_AND_ASSIGN(Starter);
};
-} // namespace starter
-} // namespace aos
+} // namespace aos::starter
#endif // AOS_STARTER_STARTERD_LIB_H_