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/events/logging/log_namer.h b/aos/events/logging/log_namer.h
index 5374acf..e0660eb 100644
--- a/aos/events/logging/log_namer.h
+++ b/aos/events/logging/log_namer.h
@@ -15,8 +15,7 @@
#include "aos/events/logging/logger_generated.h"
#include "aos/uuid.h"
-namespace aos {
-namespace logger {
+namespace aos::logger {
class LogNamer;
@@ -650,7 +649,6 @@
void OpenNodeWriter(const Node *source_node, NewDataWriter *data_writer);
};
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger
#endif // AOS_EVENTS_LOGGING_LOG_NAMER_H_
diff --git a/aos/events/logging/log_reader.h b/aos/events/logging/log_reader.h
index 901bf32..fb19e78 100644
--- a/aos/events/logging/log_reader.h
+++ b/aos/events/logging/log_reader.h
@@ -32,8 +32,7 @@
#include "aos/util/threaded_queue.h"
#include "aos/uuid.h"
-namespace aos {
-namespace logger {
+namespace aos::logger {
class EventNotifier;
@@ -950,7 +949,6 @@
ConfigRemapper config_remapper_;
};
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger
#endif // AOS_EVENTS_LOGGING_LOG_READER_H_
diff --git a/aos/events/logging/log_writer.h b/aos/events/logging/log_writer.h
index ec02b7d..eb69d7e 100644
--- a/aos/events/logging/log_writer.h
+++ b/aos/events/logging/log_writer.h
@@ -17,8 +17,7 @@
#include "aos/time/time.h"
#include "aos/uuid.h"
-namespace aos {
-namespace logger {
+namespace aos::logger {
// Packs the provided configuration into the separate config LogFileHeader
// container.
@@ -377,7 +376,6 @@
std::chrono::nanoseconds logging_delay_ = std::chrono::nanoseconds(0);
};
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger
#endif // AOS_EVENTS_LOGGING_LOG_WRITER_H_
diff --git a/aos/events/logging/logfile_sorting.h b/aos/events/logging/logfile_sorting.h
index 825a210..4f2a2e2 100644
--- a/aos/events/logging/logfile_sorting.h
+++ b/aos/events/logging/logfile_sorting.h
@@ -15,8 +15,7 @@
#include "aos/time/time.h"
#include "aos/uuid.h"
-namespace aos {
-namespace logger {
+namespace aos::logger {
struct Boots {
// Maps the boot UUID to the boot count. Since boot UUIDs are unique, we
@@ -309,7 +308,6 @@
std::vector<std::string> logger_nodes_;
};
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger
#endif // AOS_EVENTS_LOGGING_LOGFILE_SORTING_H_
diff --git a/aos/events/logging/multinode_logger_test_lib.h b/aos/events/logging/multinode_logger_test_lib.h
index f5fb4cf..63604d6 100644
--- a/aos/events/logging/multinode_logger_test_lib.h
+++ b/aos/events/logging/multinode_logger_test_lib.h
@@ -17,9 +17,7 @@
#include "aos/events/logging/lzma_encoder.h"
#endif
-namespace aos {
-namespace logger {
-namespace testing {
+namespace aos::logger::testing {
struct CompressionParams {
std::string_view extension;
@@ -196,8 +194,6 @@
typedef MultinodeLoggerTest MultinodeLoggerDeathTest;
-} // namespace testing
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger::testing
#endif // AOS_EVENTS_LOGGING_MULTINODE_LOGGER_TEST_LIB_H
diff --git a/aos/events/logging/replay_channels.h b/aos/events/logging/replay_channels.h
index f9ec144..0922acc 100644
--- a/aos/events/logging/replay_channels.h
+++ b/aos/events/logging/replay_channels.h
@@ -4,12 +4,10 @@
#include <string>
#include <vector>
-namespace aos {
-namespace logger {
+namespace aos::logger {
// Vector of pair of name and type of the channel
using ReplayChannels = std::vector<std::pair<std::string, std::string>>;
// Vector of channel indices
using ReplayChannelIndices = std::vector<size_t>;
-} // namespace logger
-} // namespace aos
+} // namespace aos::logger
#endif // AOS_EVENTS_LOGGING_REPLAY_CHANNELS_H_