Skip to content

Commit 76f093b

Browse files
committed
fix std::optional usage after rebase
1 parent 3e34bcc commit 76f093b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/input/joystick_input.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,13 +690,13 @@ input::WiiJoystickInput_Type1::WiiJoystickInput_Type1(
690690
} { }
691691

692692

693-
[[nodiscard]] helper::optional<input::NavigationEvent> input::WiiJoystickInput_Type1::get_navigation_event(
693+
[[nodiscard]] std::optional<input::NavigationEvent> input::WiiJoystickInput_Type1::get_navigation_event(
694694
const SDL_Event& event
695695
) const {
696696
if (event.type == SDL_JOYBUTTONDOWN) {
697697

698698
if (event.jbutton.which != instance_id()) {
699-
return helper::nullopt;
699+
return std::nullopt;
700700
}
701701

702702
switch (event.jbutton.button) {
@@ -713,7 +713,7 @@ input::WiiJoystickInput_Type1::WiiJoystickInput_Type1(
713713
case JOYCON_B:
714714
return NavigationEvent::BACK;
715715
default:
716-
return helper::nullopt;
716+
return std::nullopt;
717717

718718
//note, that NavigationEvent::TAB is not supported
719719
}

src/input/joystick_input.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ namespace input {
205205

206206
WiiJoystickInput_Type1(SDL_Joystick* joystick, SDL_JoystickID instance_id, const std::string& name);
207207

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;
209209

210210
[[nodiscard]] std::string describe_navigation_event(NavigationEvent event) const override;
211211

0 commit comments

Comments
 (0)