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/y2017/control_loops/superstructure/column/column.cc b/y2017/control_loops/superstructure/column/column.cc
index b8a12f7..6583357 100644
--- a/y2017/control_loops/superstructure/column/column.cc
+++ b/y2017/control_loops/superstructure/column/column.cc
@@ -15,10 +15,7 @@
#include "y2017/control_loops/superstructure/column/column_integral_plant.h"
#include "y2017/control_loops/superstructure/column/stuck_column_integral_plant.h"
-namespace y2017 {
-namespace control_loops {
-namespace superstructure {
-namespace column {
+namespace y2017::control_loops::superstructure::column {
namespace chrono = ::std::chrono;
using ::aos::monotonic_clock;
@@ -692,7 +689,4 @@
return std::make_pair(indexer_status_offset, turret_status_offset);
}
-} // namespace column
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2017
+} // namespace y2017::control_loops::superstructure::column
diff --git a/y2017/control_loops/superstructure/column/column_zeroing.cc b/y2017/control_loops/superstructure/column/column_zeroing.cc
index 53bec5f..68cdd61 100644
--- a/y2017/control_loops/superstructure/column/column_zeroing.cc
+++ b/y2017/control_loops/superstructure/column/column_zeroing.cc
@@ -2,10 +2,7 @@
#include "frc971/zeroing/wrap.h"
-namespace y2017 {
-namespace control_loops {
-namespace superstructure {
-namespace column {
+namespace y2017::control_loops::superstructure::column {
ColumnZeroingEstimator::ColumnZeroingEstimator(
const ZeroingConstants &column_constants)
@@ -82,7 +79,4 @@
return state_builder.Finish();
}
-} // namespace column
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2017
+} // namespace y2017::control_loops::superstructure::column
diff --git a/y2017/control_loops/superstructure/column/column_zeroing_test.cc b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
index ef32beb..2edcab2 100644
--- a/y2017/control_loops/superstructure/column/column_zeroing_test.cc
+++ b/y2017/control_loops/superstructure/column/column_zeroing_test.cc
@@ -16,10 +16,7 @@
#include "frc971/zeroing/zeroing.h"
#include "y2017/constants.h"
-namespace y2017 {
-namespace control_loops {
-namespace superstructure {
-namespace column {
+namespace y2017::control_loops::superstructure::column {
using ::frc971::HallEffectAndPosition;
using ::frc971::control_loops::PositionSensorSimulator;
@@ -136,7 +133,4 @@
EXPECT_TRUE(column_zeroing_estimator_.zeroed());
}
-} // namespace column
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2017
+} // namespace y2017::control_loops::superstructure::column