commit d99b1ee5f8e84834ae6039a6af6900a7ef1ffc66
author Stephan Pleines <pleines.stephan@gmail.com> Fri Feb 02 20:56:44 2024 -0800
committer Stephan Pleines <pleines.stephan@gmail.com> Sun Feb 04 13:45:04 2024 -0800
tree 148d1672932a6078d655273eda18158348b07aee
parent 910c7f01d446913aacc0b3b1b9256b2f1ecf0c94

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

frc971/control_loops/flywheel/flywheel_controller.h

diff --git a/frc971/control_loops/flywheel/flywheel_controller.h b/frc971/control_loops/flywheel/flywheel_controller.h
index db8baeb..49a4385 100644
--- a/frc971/control_loops/flywheel/flywheel_controller.h
+++ b/frc971/control_loops/flywheel/flywheel_controller.h
@@ -9,9 +9,7 @@
 #include "frc971/control_loops/hybrid_state_feedback_loop.h"
 #include "frc971/control_loops/state_feedback_loop.h"
 
-namespace frc971 {
-namespace control_loops {
-namespace flywheel {
+namespace frc971::control_loops::flywheel {
 
 class CurrentLimitedStateFeedbackController;
 
@@ -73,8 +71,6 @@
   DISALLOW_COPY_AND_ASSIGN(FlywheelController);
 };
 
-}  // namespace flywheel
-}  // namespace control_loops
-}  // namespace frc971
+}  // namespace frc971::control_loops::flywheel
 
 #endif  // FRC971_CONTROL_LOOPS_SHOOTER_FLYWHEEL_CONTROLLER_H_

frc971/control_loops/flywheel/flywheel_controller_test.cc

diff --git a/frc971/control_loops/flywheel/flywheel_controller_test.cc b/frc971/control_loops/flywheel/flywheel_controller_test.cc
index 26aabc9..eaac6e6 100644
--- a/frc971/control_loops/flywheel/flywheel_controller_test.cc
+++ b/frc971/control_loops/flywheel/flywheel_controller_test.cc
@@ -9,10 +9,7 @@
 #include "frc971/control_loops/flywheel/flywheel_test_plant.h"
 #include "frc971/control_loops/flywheel/integral_flywheel_controller_test_plant.h"
 
-namespace frc971 {
-namespace control_loops {
-namespace flywheel {
-namespace testing {
+namespace frc971::control_loops::flywheel::testing {
 class FlywheelTest : public ::frc971::testing::ControlLoopTest {
  public:
   FlywheelTest()
@@ -97,7 +94,4 @@
   RunFor(std::chrono::seconds(8));
   VerifyNearGoal();
 }
-}  // namespace testing
-}  // namespace flywheel
-}  // namespace control_loops
-}  // namespace frc971
+}  // namespace frc971::control_loops::flywheel::testing

frc971/control_loops/flywheel/flywheel_test_plant.h

diff --git a/frc971/control_loops/flywheel/flywheel_test_plant.h b/frc971/control_loops/flywheel/flywheel_test_plant.h
index 01e347d..269e147 100644
--- a/frc971/control_loops/flywheel/flywheel_test_plant.h
+++ b/frc971/control_loops/flywheel/flywheel_test_plant.h
@@ -3,9 +3,7 @@
 
 #include "frc971/control_loops/flywheel/flywheel_controller.h"
 
-namespace frc971 {
-namespace control_loops {
-namespace flywheel {
+namespace frc971::control_loops::flywheel {
 
 class FlywheelPlant : public StateFeedbackPlant<2, 1, 1> {
  public:
@@ -40,8 +38,6 @@
   double resistance_;
 };
 
-}  // namespace flywheel
-}  // namespace control_loops
-}  // namespace frc971
+}  // namespace frc971::control_loops::flywheel
 
 #endif  // FRC971_CONTROL_LOOPS_FLYWHEEL_FLYWHEEL_TEST_PLANT_H_