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/y2022/control_loops/superstructure/catapult/catapult.cc b/y2022/control_loops/superstructure/catapult/catapult.cc
index b0ec6fd..493bb46 100644
--- a/y2022/control_loops/superstructure/catapult/catapult.cc
+++ b/y2022/control_loops/superstructure/catapult/catapult.cc
@@ -10,10 +10,7 @@
#include "osqp.h"
#include "y2022/control_loops/superstructure/catapult/catapult_plant.h"
-namespace y2022 {
-namespace control_loops {
-namespace superstructure {
-namespace catapult {
+namespace y2022::control_loops::superstructure::catapult {
namespace chrono = std::chrono;
namespace {
@@ -453,7 +450,4 @@
return catapult_.MakeStatus(fbb);
}
-} // namespace catapult
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2022
+} // namespace y2022::control_loops::superstructure::catapult
diff --git a/y2022/control_loops/superstructure/catapult/catapult_main.cc b/y2022/control_loops/superstructure/catapult/catapult_main.cc
index 53d357a..e3f897c 100644
--- a/y2022/control_loops/superstructure/catapult/catapult_main.cc
+++ b/y2022/control_loops/superstructure/catapult/catapult_main.cc
@@ -4,10 +4,7 @@
#include "y2022/control_loops/superstructure/catapult/catapult.h"
#include "y2022/control_loops/superstructure/catapult/catapult_plant.h"
-namespace y2022 {
-namespace control_loops {
-namespace superstructure {
-namespace catapult {
+namespace y2022::control_loops::superstructure::catapult {
namespace chrono = std::chrono;
void OSQPSolve() {
@@ -114,10 +111,7 @@
return 0;
}
-} // namespace catapult
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2022
+} // namespace y2022::control_loops::superstructure::catapult
int main(int argc, char **argv) {
::aos::InitGoogle(&argc, &argv);
diff --git a/y2022/control_loops/superstructure/catapult/catapult_test.cc b/y2022/control_loops/superstructure/catapult/catapult_test.cc
index 7361bcd..b2cd180 100644
--- a/y2022/control_loops/superstructure/catapult/catapult_test.cc
+++ b/y2022/control_loops/superstructure/catapult/catapult_test.cc
@@ -5,11 +5,7 @@
#include "y2022/control_loops/superstructure/catapult/catapult_plant.h"
-namespace y2022 {
-namespace control_loops {
-namespace superstructure {
-namespace catapult {
-namespace testing {
+namespace y2022::control_loops::superstructure::catapult::testing {
// Tests that computing P and q with 2 different horizons comes out the same.
TEST(MPCTest, HorizonTest) {
@@ -56,8 +52,4 @@
EXPECT_NEAR(X_final.y(), X.y(), 1e-2);
}
-} // namespace testing
-} // namespace catapult
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2022
+} // namespace y2022::control_loops::superstructure::catapult::testing