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/ipc_lib/index.h b/aos/ipc_lib/index.h
index 434da7c..75f1e9b 100644
--- a/aos/ipc_lib/index.h
+++ b/aos/ipc_lib/index.h
@@ -23,8 +23,7 @@
#endif
#endif
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
struct AtomicQueueIndex;
class AtomicIndex;
@@ -305,7 +304,6 @@
::std::atomic<Index::IndexType> index_;
};
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_INDEX_H_
diff --git a/aos/ipc_lib/lockless_queue.h b/aos/ipc_lib/lockless_queue.h
index 14a11b6..4f867b9 100644
--- a/aos/ipc_lib/lockless_queue.h
+++ b/aos/ipc_lib/lockless_queue.h
@@ -18,8 +18,7 @@
#include "aos/time/time.h"
#include "aos/uuid.h"
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
// Structure to hold the state required to wake a watcher.
struct Watcher {
@@ -478,7 +477,6 @@
// Prints to stdout the data inside the queue for debugging.
void PrintLocklessQueueMemory(const LocklessQueueMemory *memory);
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_LOCKLESS_QUEUE_H_
diff --git a/aos/ipc_lib/lockless_queue_memory.h b/aos/ipc_lib/lockless_queue_memory.h
index 713d9cd..70fc8a8 100644
--- a/aos/ipc_lib/lockless_queue_memory.h
+++ b/aos/ipc_lib/lockless_queue_memory.h
@@ -10,8 +10,7 @@
#include "aos/ipc_lib/lockless_queue.h"
#include "aos/time/time.h"
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
struct LocklessQueueMemory {
// This is held during initialization. Cleanup after dead processes happens
@@ -194,7 +193,6 @@
}
};
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_LOCKLESS_QUEUE_MEMORY_H_
diff --git a/aos/ipc_lib/lockless_queue_stepping.cc b/aos/ipc_lib/lockless_queue_stepping.cc
index e819795..40d1631 100644
--- a/aos/ipc_lib/lockless_queue_stepping.cc
+++ b/aos/ipc_lib/lockless_queue_stepping.cc
@@ -25,9 +25,7 @@
#ifdef SUPPORTS_SHM_ROBUSTNESS_TEST
-namespace aos {
-namespace ipc_lib {
-namespace testing {
+namespace aos::ipc_lib::testing {
namespace {
pid_t gettid() { return syscall(SYS_gettid); }
@@ -458,8 +456,6 @@
pid_t SharedTid::Get() { return *tid_; }
-} // namespace testing
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib::testing
#endif // SUPPORTS_SHM_ROBSTNESS_TEST
diff --git a/aos/ipc_lib/lockless_queue_stepping.h b/aos/ipc_lib/lockless_queue_stepping.h
index 7aab193..590534f 100644
--- a/aos/ipc_lib/lockless_queue_stepping.h
+++ b/aos/ipc_lib/lockless_queue_stepping.h
@@ -7,9 +7,7 @@
#include "aos/ipc_lib/lockless_queue.h"
#include "aos/ipc_lib/lockless_queue_memory.h"
-namespace aos {
-namespace ipc_lib {
-namespace testing {
+namespace aos::ipc_lib::testing {
#if defined(__ARM_EABI__)
// There are various reasons why we might not actually be able to do this
@@ -142,8 +140,6 @@
#endif
-} // namespace testing
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib::testing
#endif // AOS_IPC_LIB_LOCKLESS_QUEUE_STEPPING_H_
diff --git a/aos/ipc_lib/memory_mapped_queue.h b/aos/ipc_lib/memory_mapped_queue.h
index 653dc77..bd766c1 100644
--- a/aos/ipc_lib/memory_mapped_queue.h
+++ b/aos/ipc_lib/memory_mapped_queue.h
@@ -6,8 +6,7 @@
#include "aos/configuration.h"
#include "aos/ipc_lib/lockless_queue.h"
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
std::string ShmFolder(std::string_view shm_base, const Channel *channel);
@@ -58,7 +57,6 @@
const void *const_data_;
};
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_MEMORY_MAPPED_QUEUE_H_
diff --git a/aos/ipc_lib/queue_racer.h b/aos/ipc_lib/queue_racer.h
index f0a2684..2cbe3ed 100644
--- a/aos/ipc_lib/queue_racer.h
+++ b/aos/ipc_lib/queue_racer.h
@@ -5,8 +5,7 @@
#include "aos/ipc_lib/lockless_queue.h"
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
struct ThreadState;
@@ -97,7 +96,6 @@
size_t) { return true; };
};
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_QUEUE_RACER_H_
diff --git a/aos/ipc_lib/signalfd.h b/aos/ipc_lib/signalfd.h
index a6991de..014ad5c 100644
--- a/aos/ipc_lib/signalfd.h
+++ b/aos/ipc_lib/signalfd.h
@@ -6,8 +6,7 @@
#include <initializer_list>
-namespace aos {
-namespace ipc_lib {
+namespace aos::ipc_lib {
// Class to manage a signalfd.
class SignalFd {
@@ -34,7 +33,6 @@
sigset_t blocked_mask_;
};
-} // namespace ipc_lib
-} // namespace aos
+} // namespace aos::ipc_lib
#endif // AOS_IPC_LIB_SIGNALFD_H_