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/vision/blob/codec.h b/aos/vision/blob/codec.h
index b8a8089..5872b44 100644
--- a/aos/vision/blob/codec.h
+++ b/aos/vision/blob/codec.h
@@ -5,8 +5,7 @@
#include "aos/vision/blob/range_image.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
template <typename T>
struct IntCodec {
@@ -45,7 +44,6 @@
// Parses a blob from data (Advancing data pointer by the size of the image).
const char *ParseBlobList(BlobList *blob_list, const char *data);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_BLOB_CODEC_H_
diff --git a/aos/vision/blob/contour.h b/aos/vision/blob/contour.h
index bbd59a9..c192a75 100644
--- a/aos/vision/blob/contour.h
+++ b/aos/vision/blob/contour.h
@@ -4,8 +4,7 @@
#include "aos/vision/blob/range_image.h"
#include "aos/vision/blob/region_alloc.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Countour nodes are slingly linked list chains of pixels that go around
// the boundary of a blob.
@@ -35,7 +34,6 @@
ContourNode *RangeImgToContour(const RangeImage &rimg,
AnalysisAllocator *alloc);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VIISON_BLOB_CONTOUR_H_
diff --git a/aos/vision/blob/disjoint_set.h b/aos/vision/blob/disjoint_set.h
index 38cca1d..6343e9f 100644
--- a/aos/vision/blob/disjoint_set.h
+++ b/aos/vision/blob/disjoint_set.h
@@ -3,8 +3,7 @@
#include <vector>
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Disjoint set algorithm, which is similar to what this class does:
// https://en.wikipedia.org/wiki/Disjoint-set_data_structure
@@ -40,7 +39,6 @@
std::vector<int> nodes_;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_BLOB_DISJOINT_SET_H_
diff --git a/aos/vision/blob/find_blob.h b/aos/vision/blob/find_blob.h
index d633354..f811749 100644
--- a/aos/vision/blob/find_blob.h
+++ b/aos/vision/blob/find_blob.h
@@ -3,14 +3,12 @@
#include "aos/vision/blob/range_image.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Uses disjoint sets to group ranges into disjoint RangeImage.
// ranges that overlap are grouped into the same output RangeImage.
BlobList FindBlobs(const RangeImage &input_image);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_BLOB_FIND_BLOB_H_
diff --git a/aos/vision/blob/hierarchical_contour_merge.h b/aos/vision/blob/hierarchical_contour_merge.h
index 9dd471d..83243bd 100644
--- a/aos/vision/blob/hierarchical_contour_merge.h
+++ b/aos/vision/blob/hierarchical_contour_merge.h
@@ -6,8 +6,7 @@
#include "aos/vision/blob/contour.h"
#include "aos/vision/blob/range_image.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
struct FittedLine {
Point st;
@@ -19,7 +18,6 @@
void HierarchicalMerge(ContourNode *stval, std::vector<FittedLine> *fit_lines,
float merge_rate = 4.0, int min_len = 15);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_BLOB_HIERARCHICAL_CONTOUR_MERGE_H_
diff --git a/aos/vision/blob/move_scale.h b/aos/vision/blob/move_scale.h
index 061da5c..94a9e9d 100644
--- a/aos/vision/blob/move_scale.h
+++ b/aos/vision/blob/move_scale.h
@@ -7,8 +7,7 @@
#include "aos/vision/blob/range_image.h"
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Sums img into bbox. bbox is constructed empty and grows with each call
// to GetBBox.
@@ -22,7 +21,6 @@
RangeImage MoveScale(const RangeImage &img, int dx, int dy, int scale);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_BLOB_MOVE_SCALE_H_
diff --git a/aos/vision/blob/range_image.h b/aos/vision/blob/range_image.h
index d962788..10e801f 100644
--- a/aos/vision/blob/range_image.h
+++ b/aos/vision/blob/range_image.h
@@ -5,8 +5,7 @@
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
struct Point {
int x;
@@ -100,7 +99,6 @@
// Debug print range image as ### for the ranges.
void DebugPrint(const BlobList &blobl);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_BLOB_RANGE_IMAGE_H_
diff --git a/aos/vision/blob/region_alloc.h b/aos/vision/blob/region_alloc.h
index 3275f3e..101ee6a 100644
--- a/aos/vision/blob/region_alloc.h
+++ b/aos/vision/blob/region_alloc.h
@@ -9,8 +9,7 @@
#include <utility>
#include <vector>
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Region based allocator. Used for arena allocations in vision code.
// Example use: Storing contour nodes.
@@ -52,7 +51,6 @@
size_t used_size_ = 0;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_IMAGE_REGION_ALLOC_H_
diff --git a/aos/vision/blob/stream_view.h b/aos/vision/blob/stream_view.h
index 0db69e5..9841ca2 100644
--- a/aos/vision/blob/stream_view.h
+++ b/aos/vision/blob/stream_view.h
@@ -7,8 +7,7 @@
#include "aos/vision/debug/debug_window.h"
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
class BlobStreamViewer : public DebugWindow {
public:
@@ -85,7 +84,6 @@
ImageValue image_;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_BLOB_STREAM_VIEW_H_
diff --git a/aos/vision/blob/test_utils.h b/aos/vision/blob/test_utils.h
index e0c706c..92c087c 100644
--- a/aos/vision/blob/test_utils.h
+++ b/aos/vision/blob/test_utils.h
@@ -3,8 +3,7 @@
#include "aos/vision/blob/range_image.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// For tests. Loads a RangeImage from a constant string.
//
@@ -18,7 +17,6 @@
// )"
RangeImage LoadFromTestData(int mini, const char *data);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_BLOB_TEST_UTILS_H_
diff --git a/aos/vision/blob/transpose.h b/aos/vision/blob/transpose.h
index 632f270..7ac6626 100644
--- a/aos/vision/blob/transpose.h
+++ b/aos/vision/blob/transpose.h
@@ -3,8 +3,7 @@
#include "aos/vision/blob/range_image.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
RangeImage Transpose(const RangeImage &img);
inline std::vector<RangeImage> Transpose(const std::vector<RangeImage> &imgs) {
@@ -14,7 +13,6 @@
return out;
}
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _y2017_VISION_ROT90_H_
diff --git a/aos/vision/debug/debug_framework.h b/aos/vision/debug/debug_framework.h
index c2913c2..b9fa166 100644
--- a/aos/vision/debug/debug_framework.h
+++ b/aos/vision/debug/debug_framework.h
@@ -7,8 +7,7 @@
#include "aos/vision/image/camera_params.pb.h"
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
class BlobStreamViewer;
@@ -120,7 +119,6 @@
void DebugFrameworkMain(int argc, char **argv, FilterHarness *filter,
CameraParams camera_params);
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_DEBUG_DEBUG_FRAMEWORK_H_
diff --git a/aos/vision/debug/debug_window.h b/aos/vision/debug/debug_window.h
index 573cef5..dcbc5f7 100644
--- a/aos/vision/debug/debug_window.h
+++ b/aos/vision/debug/debug_window.h
@@ -8,8 +8,7 @@
#include "aos/vision/debug/overlay.h"
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Implement Cairo version of RenderInterface.
class CairoRender : public RenderInterface {
@@ -84,7 +83,6 @@
std::unique_ptr<Internals> self;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_DEBUG_DEBUG_WINDOW_H_
diff --git a/aos/vision/debug/overlay.h b/aos/vision/debug/overlay.h
index a2cecd5..3beb9e1 100644
--- a/aos/vision/debug/overlay.h
+++ b/aos/vision/debug/overlay.h
@@ -8,8 +8,7 @@
#include "aos/vision/math/segment.h"
#include "aos/vision/math/vector.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Abstract away rendering to avoid compiling gtk for arm.
// This should match a reduced cairo rendering api.
@@ -239,7 +238,6 @@
std::vector<std::pair<Vector<2>, double>> circles_;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // _AOS_VISION_IMAGE_DEBUG_OVERLAY_H_
diff --git a/aos/vision/events/epoll_events.h b/aos/vision/events/epoll_events.h
index 7562f41..e3eeb85 100644
--- a/aos/vision/events/epoll_events.h
+++ b/aos/vision/events/epoll_events.h
@@ -11,8 +11,7 @@
#include "aos/scoped/scoped_fd.h"
#include "aos/time/time.h"
-namespace aos {
-namespace events {
+namespace aos::events {
class EpollLoop;
@@ -129,7 +128,6 @@
::std::vector<EpollWait *> waits_;
};
-} // namespace events
-} // namespace aos
+} // namespace aos::events
#endif // AOS_VISION_EVENTS_EPOLL_EVENTS_H_
diff --git a/aos/vision/events/socket_types.h b/aos/vision/events/socket_types.h
index 237bdb1..d3dcf42 100644
--- a/aos/vision/events/socket_types.h
+++ b/aos/vision/events/socket_types.h
@@ -12,8 +12,7 @@
#include "aos/vision/events/tcp_server.h"
#include "aos/vision/image/image_types.h"
-namespace aos {
-namespace events {
+namespace aos::events {
// Simple TCP client connection that sends messages prefixed by length.
// Useful to broadcast to a message all connected clients.
@@ -89,7 +88,6 @@
}
};
-} // namespace events
-} // namespace aos
+} // namespace aos::events
#endif // _AOS_VISION_EVENTS_SOCKET_TYPES_H_
diff --git a/aos/vision/events/tcp_client.h b/aos/vision/events/tcp_client.h
index 8aab2cc..16d7265 100644
--- a/aos/vision/events/tcp_client.h
+++ b/aos/vision/events/tcp_client.h
@@ -6,8 +6,7 @@
#include "aos/vision/events/epoll_events.h"
-namespace aos {
-namespace events {
+namespace aos::events {
// Handles the client connection logic to hostname:portno
class TcpClient : public EpollEvent {
@@ -17,7 +16,6 @@
// Implement ReadEvent from EpollEvent to use this class.
};
-} // namespace events
-} // namespace aos
+} // namespace aos::events
#endif // _AOS_VISION_DEBUG_TCP_CLIENT_H_
diff --git a/aos/vision/events/tcp_server.h b/aos/vision/events/tcp_server.h
index 24b4f60..49a5a8c 100644
--- a/aos/vision/events/tcp_server.h
+++ b/aos/vision/events/tcp_server.h
@@ -7,8 +7,7 @@
#include "aos/vision/events/epoll_events.h"
#include "aos/vision/events/intrusive_free_list.h"
-namespace aos {
-namespace events {
+namespace aos::events {
// Non-templatized base class of TCP server.
// TCPServer implements Construct which specializes the client connection
@@ -71,7 +70,6 @@
}
};
-} // namespace events
-} // namespace aos
+} // namespace aos::events
#endif // _AOS_VISION_EVENTS_TCP_SERVER_H_
diff --git a/aos/vision/events/udp.h b/aos/vision/events/udp.h
index 3c16b28..4acb04d 100644
--- a/aos/vision/events/udp.h
+++ b/aos/vision/events/udp.h
@@ -12,8 +12,7 @@
#include "aos/macros.h"
#include "aos/scoped/scoped_fd.h"
-namespace aos {
-namespace events {
+namespace aos::events {
// Simple wrapper around a transmitting UDP socket.
//
@@ -67,7 +66,6 @@
DISALLOW_COPY_AND_ASSIGN(RXUdpSocket);
};
-} // namespace events
-} // namespace aos
+} // namespace aos::events
#endif // AOS_VISION_EVENTS_UDP_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_
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_
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_
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_
diff --git a/aos/vision/math/segment.h b/aos/vision/math/segment.h
index d6927cb..8ae91e3 100644
--- a/aos/vision/math/segment.h
+++ b/aos/vision/math/segment.h
@@ -5,8 +5,7 @@
#include "aos/vision/math/vector.h"
-namespace aos {
-namespace vision {
+namespace aos::vision {
template <int Size>
class Segment {
@@ -76,7 +75,6 @@
Vector<Size> B_;
};
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_COMP_GEO_VECTOR_H_
diff --git a/aos/vision/math/vector.h b/aos/vision/math/vector.h
index 5e7520f..ce29901 100644
--- a/aos/vision/math/vector.h
+++ b/aos/vision/math/vector.h
@@ -5,8 +5,7 @@
#include "Eigen/Dense"
-namespace aos {
-namespace vision {
+namespace aos::vision {
// Represents an n-dimensional vector of doubles with various convenient
// shortcuts for common operations.
@@ -222,7 +221,6 @@
return nv;
}
-} // namespace vision
-} // namespace aos
+} // namespace aos::vision
#endif // AOS_VISION_MATH_VECTOR_H_