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/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_