File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -690,13 +690,13 @@ input::WiiJoystickInput_Type1::WiiJoystickInput_Type1(
690
690
} { }
691
691
692
692
693
- [[nodiscard]] helper ::optional<input::NavigationEvent> input::WiiJoystickInput_Type1::get_navigation_event (
693
+ [[nodiscard]] std ::optional<input::NavigationEvent> input::WiiJoystickInput_Type1::get_navigation_event (
694
694
const SDL_Event& event
695
695
) const {
696
696
if (event.type == SDL_JOYBUTTONDOWN) {
697
697
698
698
if (event.jbutton .which != instance_id ()) {
699
- return helper ::nullopt;
699
+ return std ::nullopt;
700
700
}
701
701
702
702
switch (event.jbutton .button ) {
@@ -713,7 +713,7 @@ input::WiiJoystickInput_Type1::WiiJoystickInput_Type1(
713
713
case JOYCON_B:
714
714
return NavigationEvent::BACK;
715
715
default :
716
- return helper ::nullopt;
716
+ return std ::nullopt;
717
717
718
718
// note, that NavigationEvent::TAB is not supported
719
719
}
Original file line number Diff line number Diff line change @@ -205,7 +205,7 @@ namespace input {
205
205
206
206
WiiJoystickInput_Type1 (SDL_Joystick* joystick, SDL_JoystickID instance_id, const std::string& name);
207
207
208
- [[nodiscard]] helper ::optional<NavigationEvent> get_navigation_event (const SDL_Event& event) const override ;
208
+ [[nodiscard]] std ::optional<NavigationEvent> get_navigation_event (const SDL_Event& event) const override ;
209
209
210
210
[[nodiscard]] std::string describe_navigation_event (NavigationEvent event) const override ;
211
211
You can’t perform that action at this time.
0 commit comments