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/autonomous/base_autonomous_actor.h b/frc971/autonomous/base_autonomous_actor.h
index 403854f..15c88d4 100644
--- a/frc971/autonomous/base_autonomous_actor.h
+++ b/frc971/autonomous/base_autonomous_actor.h
@@ -13,8 +13,7 @@
#include "frc971/control_loops/drivetrain/drivetrain_status_generated.h"
#include "y2019/control_loops/drivetrain/target_selector_generated.h"
-namespace frc971 {
-namespace autonomous {
+namespace frc971::autonomous {
class BaseAutonomousActor : public ::aos::common::actions::ActorBase<Goal> {
public:
@@ -156,7 +155,6 @@
int32_t goal_spline_handle_ = 0;
};
-} // namespace autonomous
-} // namespace frc971
+} // namespace frc971::autonomous
#endif // FRC971_AUTONOMOUS_BASE_AUTONOMOUS_ACTOR_H_
diff --git a/frc971/autonomous/user_button_localized_autonomous_actor.cc b/frc971/autonomous/user_button_localized_autonomous_actor.cc
index 5358a28..21fb42a 100644
--- a/frc971/autonomous/user_button_localized_autonomous_actor.cc
+++ b/frc971/autonomous/user_button_localized_autonomous_actor.cc
@@ -5,8 +5,7 @@
namespace this_thread = ::std::this_thread;
namespace drivetrain = frc971::control_loops::drivetrain;
-namespace frc971 {
-namespace autonomous {
+namespace frc971::autonomous {
UserButtonLocalizedAutonomousActor::UserButtonLocalizedAutonomousActor(
::aos::EventLoop *event_loop,
@@ -109,5 +108,4 @@
return Run(params);
}
-} // namespace autonomous
-} // namespace frc971
+} // namespace frc971::autonomous
diff --git a/frc971/autonomous/user_button_localized_autonomous_actor.h b/frc971/autonomous/user_button_localized_autonomous_actor.h
index 07d083a..3f6503d 100644
--- a/frc971/autonomous/user_button_localized_autonomous_actor.h
+++ b/frc971/autonomous/user_button_localized_autonomous_actor.h
@@ -14,8 +14,7 @@
#include "frc971/control_loops/drivetrain/drivetrain_status_generated.h"
#include "y2019/control_loops/drivetrain/target_selector_generated.h"
-namespace frc971 {
-namespace autonomous {
+namespace frc971::autonomous {
class UserButtonLocalizedAutonomousActor : public BaseAutonomousActor {
public:
@@ -54,7 +53,6 @@
bool user_indicated_safe_to_reset_ = false;
};
-} // namespace autonomous
-} // namespace frc971
+} // namespace frc971::autonomous
#endif // FRC971_AUTONOMOUS_EXTENDED_AUTONOMOUS_ACTOR_H_