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/testing/flatbuffer_eq.h b/aos/testing/flatbuffer_eq.h
index b560aaa..8a42b5f 100644
--- a/aos/testing/flatbuffer_eq.h
+++ b/aos/testing/flatbuffer_eq.h
@@ -7,8 +7,7 @@
#include "aos/flatbuffers.h"
#include "aos/json_to_flatbuffer.h"
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Use FlatbufferUnwrapped to instantiate this.
template <typename T>
@@ -85,7 +84,6 @@
new FlatbufferEqMatcher(aos::FlatbufferVector<T>(expected))));
}
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_TESTING_FLATBUFFER_EQ_H_
diff --git a/aos/testing/path.h b/aos/testing/path.h
index 7f4187d..ebe63fe 100644
--- a/aos/testing/path.h
+++ b/aos/testing/path.h
@@ -4,13 +4,11 @@
#include <string>
#include <string_view>
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Returns the path to the provided artifact which works
std::string ArtifactPath(std::string_view path);
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_TESTING_PATH_H_
diff --git a/aos/testing/test_logging.h b/aos/testing/test_logging.h
index 5e01879..3671aa1 100644
--- a/aos/testing/test_logging.h
+++ b/aos/testing/test_logging.h
@@ -3,8 +3,7 @@
#include "aos/time/time.h"
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Enables the logging framework for use during a gtest test.
// It will print out all WARNING and above messages all of the time. It will
@@ -23,7 +22,6 @@
// we want to use graphing tools to verify what's happening.
void ForcePrintLogsDuringTests();
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_TESTING_TEST_LOGGING_H_
diff --git a/aos/testing/test_shm.h b/aos/testing/test_shm.h
index a1c79ee..658a72d 100644
--- a/aos/testing/test_shm.h
+++ b/aos/testing/test_shm.h
@@ -3,8 +3,7 @@
#include "aos/ipc_lib/shared_mem.h"
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Manages creating and cleaning up "shared memory" which works within this
// process and any that it fork(2)s.
@@ -18,7 +17,6 @@
struct aos_core global_core_data_;
};
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_TESTING_TEST_SHM_H_
diff --git a/aos/testing/tmpdir.h b/aos/testing/tmpdir.h
index 8eabf86..bf8e7d7 100644
--- a/aos/testing/tmpdir.h
+++ b/aos/testing/tmpdir.h
@@ -3,8 +3,7 @@
#include <string>
-namespace aos {
-namespace testing {
+namespace aos::testing {
// Returns a usable temporary directory.
std::string TestTmpDir();
@@ -13,7 +12,6 @@
// otherwise.
void SetTestShmBase();
-} // namespace testing
-} // namespace aos
+} // namespace aos::testing
#endif // AOS_TESTING_TMPDIR_H_