commit d99b1ee5f8e84834ae6039a6af6900a7ef1ffc66
author Stephan Pleines <pleines.stephan@gmail.com> Fri Feb 02 20:56:44 2024 -0800
committer Stephan Pleines <pleines.stephan@gmail.com> Sun Feb 04 13:45:04 2024 -0800
tree 148d1672932a6078d655273eda18158348b07aee
parent 910c7f01d446913aacc0b3b1b9256b2f1ecf0c94

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

aos/vision/image/image_dataset.h

diff --git a/aos/vision/image/image_dataset.h b/aos/vision/image/image_dataset.h
index 7801cec..10ea13e 100644
--- a/aos/vision/image/image_dataset.h
+++ b/aos/vision/image/image_dataset.h
@@ -4,8 +4,7 @@
 #include <string>
 #include <vector>
 
-namespace aos {
-namespace vision {
+namespace aos::vision {
 
 struct DatasetFrame {
   // TODO: These should be V4L formats ideally.
@@ -17,7 +16,6 @@
 
 DatasetFrame LoadFile(const std::string &jpeg_filename);
 
-}  // namespace vision
-}  // namespace aos
+}  // namespace aos::vision
 
 #endif  // _AOS_VISION_IMAGE_IMAGE_DATASET_H_

aos/vision/image/image_stream.h

diff --git a/aos/vision/image/image_stream.h b/aos/vision/image/image_stream.h
index 60e71b2..5a45c6f 100644
--- a/aos/vision/image/image_stream.h
+++ b/aos/vision/image/image_stream.h
@@ -7,8 +7,7 @@
 #include "aos/vision/image/camera_params.pb.h"
 #include "aos/vision/image/reader.h"
 
-namespace aos {
-namespace vision {
+namespace aos::vision {
 
 // Converts a camera reader into a virtual base class that calls ProcessImage
 // on each new image.
@@ -45,7 +44,6 @@
   std::unique_ptr<::camera::Reader> reader_;
 };
 
-}  // namespace vision
-}  // namespace aos
+}  // namespace aos::vision
 
 #endif  // AOS_VISION_IMAGE_IMAGE_STREAM_H_

aos/vision/image/image_types.h

diff --git a/aos/vision/image/image_types.h b/aos/vision/image/image_types.h
index ee56f7d..80b802e 100644
--- a/aos/vision/image/image_types.h
+++ b/aos/vision/image/image_types.h
@@ -8,8 +8,7 @@
 #include <sstream>
 #include <string_view>
 
-namespace aos {
-namespace vision {
+namespace aos::vision {
 
 // Bounding box for a RangeImage.
 struct ImageBBox {
@@ -106,7 +105,6 @@
 using ImagePtr = Array2dPtr<PixelRef>;
 using ImageValue = ValueArray2d<PixelRef>;
 
-}  // namespace vision
-}  // namespace aos
+}  // namespace aos::vision
 
 #endif  // _AOS_VISION_IMAGE_IMAGE_TYPES_H_

aos/vision/image/jpeg_routines.h

diff --git a/aos/vision/image/jpeg_routines.h b/aos/vision/image/jpeg_routines.h
index 59ad296..4bac976 100644
--- a/aos/vision/image/jpeg_routines.h
+++ b/aos/vision/image/jpeg_routines.h
@@ -8,8 +8,7 @@
 
 #include "aos/vision/image/image_types.h"
 
-namespace aos {
-namespace vision {
+namespace aos::vision {
 
 // Returns true if successful false if an error was encountered.
 // Will decompress data into out. Out must be of the right size
@@ -32,7 +31,6 @@
   return ProcessJpeg(data, value->data());
 }
 
-}  // namespace vision
-}  // namespace aos
+}  // namespace aos::vision
 
 #endif  // _AOS_VISION_IMAGE_JPEGROUTINES_H_