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/frc971/input/action_joystick_input.h b/frc971/input/action_joystick_input.h
index f77f416..ac37c2a 100644
--- a/frc971/input/action_joystick_input.h
+++ b/frc971/input/action_joystick_input.h
@@ -8,8 +8,7 @@
#include "frc971/input/drivetrain_input.h"
#include "frc971/input/joystick_input.h"
-namespace frc971 {
-namespace input {
+namespace frc971::input {
// Class to abstract out managing actions, autonomous mode, and drivetrains.
// Turns out we do the same thing every year, so let's stop copying it.
@@ -139,7 +138,6 @@
::aos::Fetcher<::frc971::autonomous::AutonomousMode> autonomous_mode_fetcher_;
};
-} // namespace input
-} // namespace frc971
+} // namespace frc971::input
#endif // AOS_INPUT_ACTION_JOYSTICK_INPUT_H_
diff --git a/frc971/input/driver_station_data.h b/frc971/input/driver_station_data.h
index 5ebf8f4..7d8dc3e 100644
--- a/frc971/input/driver_station_data.h
+++ b/frc971/input/driver_station_data.h
@@ -9,9 +9,7 @@
#include "frc971/input/joystick_state_generated.h"
-namespace frc971 {
-namespace input {
-namespace driver_station {
+namespace frc971::input::driver_station {
// Represents a feature of a joystick (a button or an axis).
// All indices are 1-based.
@@ -126,8 +124,6 @@
SavedJoystickState current_values_, old_values_;
};
-} // namespace driver_station
-} // namespace input
-} // namespace frc971
+} // namespace frc971::input::driver_station
#endif // AOS_INPUT_DRIVER_STATION_DATA_H_
diff --git a/frc971/input/drivetrain_input.h b/frc971/input/drivetrain_input.h
index 0cb724d..173c551 100644
--- a/frc971/input/drivetrain_input.h
+++ b/frc971/input/drivetrain_input.h
@@ -13,8 +13,7 @@
#include "frc971/control_loops/drivetrain/drivetrain_status_generated.h"
#include "frc971/input/driver_station_data.h"
-namespace frc971 {
-namespace input {
+namespace frc971::input {
using control_loops::drivetrain::PistolBottomButtonUse;
using control_loops::drivetrain::PistolSecondButtonUse;
@@ -271,7 +270,6 @@
const ::frc971::input::driver_station::Data &data) override;
};
-} // namespace input
-} // namespace frc971
+} // namespace frc971::input
#endif // AOS_INPUT_DRIVETRAIN_INPUT_H_
diff --git a/frc971/input/joystick_input.h b/frc971/input/joystick_input.h
index 074908d..b6d0ceb 100644
--- a/frc971/input/joystick_input.h
+++ b/frc971/input/joystick_input.h
@@ -6,8 +6,7 @@
#include "aos/events/event_loop.h"
#include "frc971/input/driver_station_data.h"
-namespace frc971 {
-namespace input {
+namespace frc971::input {
// A class for handling joystick packet values.
// It will call RunIteration each time a new packet is received.
@@ -40,7 +39,6 @@
int mode_;
};
-} // namespace input
-} // namespace frc971
+} // namespace frc971::input
#endif // AOS_INPUT_JOYSTICK_INPUT_H_
diff --git a/frc971/input/redundant_joystick_data.h b/frc971/input/redundant_joystick_data.h
index c6cdb78..56fc6b5 100644
--- a/frc971/input/redundant_joystick_data.h
+++ b/frc971/input/redundant_joystick_data.h
@@ -3,9 +3,7 @@
#include "frc971/input/driver_station_data.h"
-namespace frc971 {
-namespace input {
-namespace driver_station {
+namespace frc971::input::driver_station {
// A class to wrap driver_station::Data and map logical joystick numbers to
// their actual numbers in the order they are on the driverstation.
@@ -51,8 +49,6 @@
const Data &data_;
};
-} // namespace driver_station
-} // namespace input
-} // namespace frc971
+} // namespace frc971::input::driver_station
#endif // AOS_INPUT_REDUNDANT_JOYSTICK_DATA_H_