Fix namespace nesting in y2024
Signed-off-by: Maxwell Henderson <mxwhenderson@gmail.com>
Change-Id: If886abc4cfe72cb3ea768aaf9d924f0e8c76f02b
diff --git a/y2024/autonomous/auto_splines.h b/y2024/autonomous/auto_splines.h
index efdfb33..309222f 100644
--- a/y2024/autonomous/auto_splines.h
+++ b/y2024/autonomous/auto_splines.h
@@ -13,8 +13,7 @@
*/
-namespace y2024 {
-namespace autonomous {
+namespace y2024::autonomous {
class AutonomousSplines {
public:
@@ -39,7 +38,6 @@
aos::FlatbufferDetachedBuffer<frc971::MultiSpline> test_spline_;
};
-} // namespace autonomous
-} // namespace y2024
+} // namespace y2024::autonomous
#endif // Y2024_AUTONOMOUS_AUTO_SPLINES_H_
diff --git a/y2024/autonomous/autonomous_actor.h b/y2024/autonomous/autonomous_actor.h
index 6603080..c3d7d79 100644
--- a/y2024/autonomous/autonomous_actor.h
+++ b/y2024/autonomous/autonomous_actor.h
@@ -11,8 +11,7 @@
#include "y2024/control_loops/superstructure/superstructure_goal_generated.h"
#include "y2024/control_loops/superstructure/superstructure_status_generated.h"
-namespace y2024 {
-namespace autonomous {
+namespace y2024::autonomous {
class AutonomousActor : public ::frc971::autonomous::BaseAutonomousActor {
public:
@@ -60,7 +59,6 @@
const ::std::vector<::Eigen::Matrix<double, 3, 1>> points_;
};
-} // namespace autonomous
-} // namespace y2024
+} // namespace y2024::autonomous
#endif // Y2024_AUTONOMOUS_AUTONOMOUS_ACTOR_H_
diff --git a/y2024/constants/constants_validator_test.cc b/y2024/constants/constants_validator_test.cc
index 238bfc3..cd478a8 100644
--- a/y2024/constants/constants_validator_test.cc
+++ b/y2024/constants/constants_validator_test.cc
@@ -4,9 +4,7 @@
#include "aos/json_to_flatbuffer.h"
#include "y2024/constants/constants_list_generated.h"
-namespace y2024 {
-namespace constants {
-namespace testing {
+namespace y2024::constants::testing {
class ConstantsValidatorTest : public ::testing::Test {};
TEST_F(ConstantsValidatorTest, CheckConstants) {
@@ -16,6 +14,4 @@
.constants());
}
-} // namespace testing
-} // namespace constants
-} // namespace y2024
+} // namespace y2024::constants::testing
diff --git a/y2024/control_loops/drivetrain/drivetrain_base.h b/y2024/control_loops/drivetrain/drivetrain_base.h
index 807981a..e7eb581 100644
--- a/y2024/control_loops/drivetrain/drivetrain_base.h
+++ b/y2024/control_loops/drivetrain/drivetrain_base.h
@@ -3,15 +3,11 @@
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
-namespace y2024 {
-namespace control_loops {
-namespace drivetrain {
+namespace y2024::control_loops::drivetrain {
const ::frc971::control_loops::drivetrain::DrivetrainConfig<double> &
GetDrivetrainConfig();
-} // namespace drivetrain
-} // namespace control_loops
-} // namespace y2024
+} // namespace y2024::control_loops::drivetrain
#endif // Y2024_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
diff --git a/y2024/control_loops/superstructure/superstructure.h b/y2024/control_loops/superstructure/superstructure.h
index 1d7cdf5..b3ab37e 100644
--- a/y2024/control_loops/superstructure/superstructure.h
+++ b/y2024/control_loops/superstructure/superstructure.h
@@ -16,9 +16,7 @@
#include "y2024/control_loops/superstructure/superstructure_position_generated.h"
#include "y2024/control_loops/superstructure/superstructure_status_generated.h"
-namespace y2024 {
-namespace control_loops {
-namespace superstructure {
+namespace y2024::control_loops::superstructure {
class Superstructure
: public ::frc971::controls::ControlLoop<Goal, Position, Status, Output> {
@@ -47,8 +45,6 @@
DISALLOW_COPY_AND_ASSIGN(Superstructure);
};
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2024
+} // namespace y2024::control_loops::superstructure
#endif // Y2024_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_H_