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/y2019/jevois/camera/image_stream.cc b/y2019/jevois/camera/image_stream.cc
index 44fd8e5..3268a67 100644
--- a/y2019/jevois/camera/image_stream.cc
+++ b/y2019/jevois/camera/image_stream.cc
@@ -2,8 +2,7 @@
#include "aos/logging/logging.h"
-namespace y2019 {
-namespace camera {
+namespace y2019::camera {
void ImageStreamEvent::ProcessHelper(
aos::vision::DataRef data, aos::monotonic_clock::time_point timestamp) {
@@ -14,5 +13,4 @@
ProcessImage(data, timestamp);
}
-} // namespace camera
-} // namespace y2019
+} // namespace y2019::camera
diff --git a/y2019/jevois/camera/reader.cc b/y2019/jevois/camera/reader.cc
index 84bf7fe..09e07db 100644
--- a/y2019/jevois/camera/reader.cc
+++ b/y2019/jevois/camera/reader.cc
@@ -19,8 +19,7 @@
#define CLEAR(x) memset(&(x), 0, sizeof(x))
-namespace y2019 {
-namespace camera {
+namespace y2019::camera {
using ::camera::xioctl;
@@ -296,5 +295,4 @@
}
}
-} // namespace camera
-} // namespace y2019
+} // namespace y2019::camera
diff --git a/y2019/jevois/cobs_test.cc b/y2019/jevois/cobs_test.cc
index 303c4d3..61604ad 100644
--- a/y2019/jevois/cobs_test.cc
+++ b/y2019/jevois/cobs_test.cc
@@ -5,8 +5,7 @@
#include "aos/testing/test_logging.h"
-namespace frc971 {
-namespace jevois {
+namespace frc971::jevois {
// Tests the size conversions for some known, simple values.
TEST(CobsMaxEncodedSizeTest, Simple) {
@@ -289,5 +288,4 @@
packetizer.received_packet());
}
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois
diff --git a/y2019/jevois/serial.cc b/y2019/jevois/serial.cc
index cd0bb99..3bcc87e 100644
--- a/y2019/jevois/serial.cc
+++ b/y2019/jevois/serial.cc
@@ -8,8 +8,7 @@
#include "aos/logging/logging.h"
-namespace y2019 {
-namespace jevois {
+namespace y2019::jevois {
int open_via_terminos(const char *tty_name) {
int itsDev = ::open(tty_name, O_RDWR | O_NOCTTY | O_NONBLOCK);
@@ -75,5 +74,4 @@
return itsDev;
}
-} // namespace jevois
-} // namespace y2019
+} // namespace y2019::jevois
diff --git a/y2019/jevois/serial.h b/y2019/jevois/serial.h
index 14e2f98..04114cc 100644
--- a/y2019/jevois/serial.h
+++ b/y2019/jevois/serial.h
@@ -1,12 +1,10 @@
#ifndef Y2019_JEVOIS_SERIAL_H_
#define Y2019_JEVOIS_SERIAL_H_
-namespace y2019 {
-namespace jevois {
+namespace y2019::jevois {
int open_via_terminos(const char *tty_name);
-} // namespace jevois
-} // namespace y2019
+} // namespace y2019::jevois
#endif // Y2019_JEVOIS_SERIAL_H_
diff --git a/y2019/jevois/spi.cc b/y2019/jevois/spi.cc
index b3b6550..85ad988 100644
--- a/y2019/jevois/spi.cc
+++ b/y2019/jevois/spi.cc
@@ -39,8 +39,7 @@
// Note that empty frames are still sent to indicate that the camera is
// still working even though it doesn't see any targets.
-namespace frc971 {
-namespace jevois {
+namespace frc971::jevois {
namespace {
constexpr float heading_min() { return -3; }
@@ -312,5 +311,4 @@
return message;
}
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois
diff --git a/y2019/jevois/spi_test.cc b/y2019/jevois/spi_test.cc
index c600869..3c69993 100644
--- a/y2019/jevois/spi_test.cc
+++ b/y2019/jevois/spi_test.cc
@@ -4,9 +4,7 @@
#include "gtest/gtest.h"
-namespace frc971 {
-namespace jevois {
-namespace testing {
+namespace frc971::jevois::testing {
// Tests packing and then unpacking an empty message.
TEST(SpiToRoborioPackTest, Empty) {
@@ -228,6 +226,4 @@
EXPECT_EQ(input_message, output_message.value());
}
-} // namespace testing
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois::testing
diff --git a/y2019/jevois/teensy.cc b/y2019/jevois/teensy.cc
index 7c71ae8..9d755a3 100644
--- a/y2019/jevois/teensy.cc
+++ b/y2019/jevois/teensy.cc
@@ -22,8 +22,7 @@
// All indices here refer to the ports as numbered on the PCB.
-namespace frc971 {
-namespace jevois {
+namespace frc971::jevois {
namespace {
// Holds all of our hardware UARTs. There is exactly one global instance for
@@ -1022,5 +1021,4 @@
} // extern "C"
} // namespace
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois
diff --git a/y2019/jevois/uart.cc b/y2019/jevois/uart.cc
index 0fc25c9..93e0072 100644
--- a/y2019/jevois/uart.cc
+++ b/y2019/jevois/uart.cc
@@ -13,8 +13,7 @@
#define AOS_CHECK_GE(...)
#endif
-namespace frc971 {
-namespace jevois {
+namespace frc971::jevois {
UartToTeensyBuffer UartPackToTeensy(const CameraFrame &message) {
std::array<char, uart_to_teensy_size()> buffer;
@@ -197,5 +196,4 @@
return message;
}
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois
diff --git a/y2019/jevois/uart_test.cc b/y2019/jevois/uart_test.cc
index 5a3a330..621412d 100644
--- a/y2019/jevois/uart_test.cc
+++ b/y2019/jevois/uart_test.cc
@@ -4,9 +4,7 @@
#include "gtest/gtest.h"
-namespace frc971 {
-namespace jevois {
-namespace testing {
+namespace frc971::jevois::testing {
// Tests packing and then unpacking a message with arbitrary values.
TEST(UartToTeensyTest, Basic) {
@@ -123,6 +121,4 @@
}
}
-} // namespace testing
-} // namespace jevois
-} // namespace frc971
+} // namespace frc971::jevois::testing