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/epoll.h b/aos/events/epoll.h
index 2b7eb76..526c6a7 100644
--- a/aos/events/epoll.h
+++ b/aos/events/epoll.h
@@ -12,8 +12,7 @@
#include "aos/time/time.h"
-namespace aos {
-namespace internal {
+namespace aos::internal {
// Class wrapping up timerfd.
class TimerFd {
@@ -187,7 +186,6 @@
std::vector<std::function<void()>> before_epoll_wait_functions_;
};
-} // namespace internal
-} // namespace aos
+} // namespace aos::internal
#endif // AOS_EVENTS_EPOLL_H_
diff --git a/aos/events/event_loop_param_test.h b/aos/events/event_loop_param_test.h
index d466a1e..f2b16c5 100644
--- a/aos/events/event_loop_param_test.h
+++ b/aos/events/event_loop_param_test.h
@@ -18,8 +18,7 @@
#include "aos/network/message_bridge_server_schema.h"
#include "aos/network/timestamp_schema.h"
-namespace aos {
-namespace testing {
+namespace aos::testing {
class EventLoopTestFactory {
public:
@@ -398,7 +397,6 @@
// Sends a test message with value 0 with the given sender
RawSender::Error SendTestMessage(aos::Sender<TestMessage> &sender);
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // _AOS_EVENTS_EVENT_LOOP_PARAM_TEST_H_
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_
diff --git a/aos/events/message_counter.h b/aos/events/message_counter.h
index 418c1eb..13d75c5 100644
--- a/aos/events/message_counter.h
+++ b/aos/events/message_counter.h
@@ -3,8 +3,7 @@
#include "aos/events/event_loop.h"
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Simple class to count messages on a channel easily. This only counts
// messages published while running.
@@ -22,7 +21,6 @@
size_t count_ = 0;
};
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_EVENTS_MESSAGE_COUNTER_H_
diff --git a/aos/events/simulated_network_bridge.h b/aos/events/simulated_network_bridge.h
index faa6398..14a7321 100644
--- a/aos/events/simulated_network_bridge.h
+++ b/aos/events/simulated_network_bridge.h
@@ -8,8 +8,7 @@
#include "aos/network/remote_message_generated.h"
#include "aos/network/timestamp_channel.h"
-namespace aos {
-namespace message_bridge {
+namespace aos::message_bridge {
class RawMessageDelayer;
@@ -235,7 +234,6 @@
std::vector<std::unique_ptr<DelayersVector>> delayers_list_;
};
-} // namespace message_bridge
-} // namespace aos
+} // namespace aos::message_bridge
#endif // AOS_EVENTS_SIMULATED_NETWORK_BRIDGE_H_
diff --git a/aos/events/timing_statistics.h b/aos/events/timing_statistics.h
index 3c8c741..ef07254 100644
--- a/aos/events/timing_statistics.h
+++ b/aos/events/timing_statistics.h
@@ -6,8 +6,7 @@
#include "aos/events/event_loop_generated.h"
#include "aos/util/error_counter.h"
-namespace aos {
-namespace internal {
+namespace aos::internal {
// Class to compute statistics for the timing report.
class TimingStatistic {
@@ -113,7 +112,6 @@
timing::Timer *timer = nullptr;
};
-} // namespace internal
-} // namespace aos
+} // namespace aos::internal
#endif // AOS_EVENTS_TIMING_STATISTICS_H_