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
diff --git a/y2021_bot3/actors/auto_splines.h b/y2021_bot3/actors/auto_splines.h
index 9984c15..9225a49 100644
--- a/y2021_bot3/actors/auto_splines.h
+++ b/y2021_bot3/actors/auto_splines.h
@@ -11,8 +11,7 @@
*/
-namespace y2021_bot3 {
-namespace actors {
+namespace y2021_bot3::actors {
class AutonomousSplines {
public:
@@ -22,7 +21,6 @@
aos::Sender<frc971::control_loops::drivetrain::Goal>::Builder *builder);
};
-} // namespace actors
-} // namespace y2021_bot3
+} // namespace y2021_bot3::actors
#endif // Y2021_BOT3_ACTORS_AUTO_SPLINES_H_
diff --git a/y2021_bot3/actors/autonomous_actor.h b/y2021_bot3/actors/autonomous_actor.h
index 5fa509b..bcf58ee 100644
--- a/y2021_bot3/actors/autonomous_actor.h
+++ b/y2021_bot3/actors/autonomous_actor.h
@@ -7,8 +7,7 @@
#include "frc971/control_loops/control_loops_generated.h"
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
-namespace y2021_bot3 {
-namespace actors {
+namespace y2021_bot3::actors {
class AutonomousActor : public ::frc971::autonomous::BaseAutonomousActor {
public:
@@ -21,7 +20,6 @@
void Reset();
};
-} // namespace actors
-} // namespace y2021_bot3
+} // namespace y2021_bot3::actors
#endif // Y2021_BOT3_ACTORS_AUTONOMOUS_ACTOR_H_
diff --git a/y2021_bot3/constants.h b/y2021_bot3/constants.h
index f0cbacb..a6d7957 100644
--- a/y2021_bot3/constants.h
+++ b/y2021_bot3/constants.h
@@ -10,8 +10,7 @@
#include "frc971/control_loops/static_zeroing_single_dof_profiled_subsystem.h"
#include "y2021_bot3/control_loops/drivetrain/drivetrain_dog_motor_plant.h"
-namespace y2021_bot3 {
-namespace constants {
+namespace y2021_bot3::constants {
struct Values {
static const int kZeroingSampleSize = 200;
@@ -42,7 +41,6 @@
// them.
const Values &GetValuesForTeam(uint16_t team_number);
-} // namespace constants
-} // namespace y2021_bot3
+} // namespace y2021_bot3::constants
#endif // Y2021_BOT3_CONSTANTS_H_
diff --git a/y2021_bot3/control_loops/drivetrain/drivetrain_base.h b/y2021_bot3/control_loops/drivetrain/drivetrain_base.h
index f796d4e..c9a06c6 100644
--- a/y2021_bot3/control_loops/drivetrain/drivetrain_base.h
+++ b/y2021_bot3/control_loops/drivetrain/drivetrain_base.h
@@ -3,15 +3,11 @@
#include "frc971/control_loops/drivetrain/drivetrain_config.h"
-namespace y2021_bot3 {
-namespace control_loops {
-namespace drivetrain {
+namespace y2021_bot3::control_loops::drivetrain {
const ::frc971::control_loops::drivetrain::DrivetrainConfig<double> &
GetDrivetrainConfig();
-} // namespace drivetrain
-} // namespace control_loops
-} // namespace y2021_bot3
+} // namespace y2021_bot3::control_loops::drivetrain
#endif // Y2021_BOT3_CONTROL_LOOPS_DRIVETRAIN_DRIVETRAIN_BASE_H_
diff --git a/y2021_bot3/control_loops/superstructure/superstructure.h b/y2021_bot3/control_loops/superstructure/superstructure.h
index 23dd801..4a0d701 100644
--- a/y2021_bot3/control_loops/superstructure/superstructure.h
+++ b/y2021_bot3/control_loops/superstructure/superstructure.h
@@ -9,9 +9,7 @@
#include "y2021_bot3/control_loops/superstructure/superstructure_position_generated.h"
#include "y2021_bot3/control_loops/superstructure/superstructure_status_generated.h"
-namespace y2021_bot3 {
-namespace control_loops {
-namespace superstructure {
+namespace y2021_bot3::control_loops::superstructure {
class Superstructure
: public ::frc971::controls::ControlLoop<Goal, Position, Status, Output> {
@@ -28,8 +26,6 @@
DISALLOW_COPY_AND_ASSIGN(Superstructure);
};
-} // namespace superstructure
-} // namespace control_loops
-} // namespace y2021_bot3
+} // namespace y2021_bot3::control_loops::superstructure
#endif // Y2021_BOT3_CONTROL_LOOPS_SUPERSTRUCTURE_SUPERSTRUCTURE_H_