Nest all namespaces
The compiler supports this now. We can type less going forward.
No functional changes.
Signed-off-by: Stephan Pleines <pleines.stephan@gmail.com>
Change-Id: I29d6fa4f9aacc0e381f1a7637294db0392466995
diff --git a/aos/vision/debug/aveugle-source.cc b/aos/vision/debug/aveugle-source.cc
index 65a8e84..46b9694 100644
--- a/aos/vision/debug/aveugle-source.cc
+++ b/aos/vision/debug/aveugle-source.cc
@@ -7,8 +7,7 @@
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_stream.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
class AveugleImageSource : public ImageSource {
public:
@@ -73,5 +72,4 @@
REGISTER_IMAGE_SOURCE("jevois", AveugleImageSource);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/blob_log-source.cc b/aos/vision/debug/blob_log-source.cc
index 4dd5675..c5ee67c 100644
--- a/aos/vision/debug/blob_log-source.cc
+++ b/aos/vision/debug/blob_log-source.cc
@@ -14,8 +14,7 @@
#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/debug/overlay.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
namespace {
@@ -365,5 +364,4 @@
REGISTER_IMAGE_SOURCE("blob_log", BlobLogImageSource);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/camera-source.cc b/aos/vision/debug/camera-source.cc
index 578ebc1..685b7eb 100644
--- a/aos/vision/debug/camera-source.cc
+++ b/aos/vision/debug/camera-source.cc
@@ -7,8 +7,7 @@
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_stream.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
class CameraImageSource : public ImageSource {
public:
@@ -63,5 +62,4 @@
REGISTER_IMAGE_SOURCE("camera", CameraImageSource);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/debug_framework.cc b/aos/vision/debug/debug_framework.cc
index 0b0d2c7..770eefd 100644
--- a/aos/vision/debug/debug_framework.cc
+++ b/aos/vision/debug/debug_framework.cc
@@ -9,8 +9,7 @@
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/image/jpeg_routines.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Detect screen height on smaller monitors.
int GetScreenHeight() {
@@ -176,5 +175,4 @@
replay.Loop()->RunWithGtkMain();
}
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/debug_window.cc b/aos/vision/debug/debug_window.cc
index b998c03..40d1468 100644
--- a/aos/vision/debug/debug_window.cc
+++ b/aos/vision/debug/debug_window.cc
@@ -12,8 +12,7 @@
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
template <typename T, gboolean (T::*DrawMethod)(cairo_t *cr)>
gboolean DrawCallback(GtkWidget *, cairo_t *cr, gpointer data) {
@@ -181,5 +180,4 @@
cairo_restore(cr_);
}
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/jpeg_list-source.cc b/aos/vision/debug/jpeg_list-source.cc
index ecc3f14..7c6c9dc 100644
--- a/aos/vision/debug/jpeg_list-source.cc
+++ b/aos/vision/debug/jpeg_list-source.cc
@@ -6,8 +6,7 @@
#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/image/image_dataset.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
class JpegListImageSource : public ImageSource {
public:
@@ -65,5 +64,4 @@
REGISTER_IMAGE_SOURCE("jpeg_list", JpegListImageSource);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
diff --git a/aos/vision/debug/tcp-source.cc b/aos/vision/debug/tcp-source.cc
index de406ae..7749f5c 100644
--- a/aos/vision/debug/tcp-source.cc
+++ b/aos/vision/debug/tcp-source.cc
@@ -12,8 +12,7 @@
#include "aos/vision/debug/debug_framework.h"
#include "aos/vision/events/tcp_client.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Reads packets in the form:
// uint32 length
@@ -152,5 +151,4 @@
REGISTER_IMAGE_SOURCE("tcp", TCPImageSource);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision