diff --git a/src/core/memory_card.cpp b/src/core/memory_card.cpp index 97212e727..6d8f886ff 100644 --- a/src/core/memory_card.cpp +++ b/src/core/memory_card.cpp @@ -21,7 +21,7 @@ LOG_CHANNEL(MemoryCard); -static constexpr std::array s_event_names = {{ +static constexpr std::array s_event_names = {{ "Memory Card 1 Host Flush", "Memory Card 2 Host Flush", "Memory Card 3 Host Flush", diff --git a/src/core/timing_event.cpp b/src/core/timing_event.cpp index bb243f350..277a60f92 100644 --- a/src/core/timing_event.cpp +++ b/src/core/timing_event.cpp @@ -299,7 +299,7 @@ static TimingEvent* TimingEvents::FindActiveEvent(const std::string_view name) { for (TimingEvent* event = s_state.active_events_head; event; event = event->next) { - if (event->GetName() == name) + if (name == event->GetName()) return event; } @@ -512,7 +512,8 @@ bool TimingEvents::DoState(StateWrapper& sw) for (TimingEvent* event = s_state.active_events_head; event; event = event->next) { - sw.Do(&event->m_name); + std::string_view event_name = event->GetName(); + sw.Do(&event_name); GlobalTicks next_run_time = (s_state.current_event == event) ? s_state.current_event_next_run_time : event->m_next_run_time; sw.Do(&next_run_time); @@ -528,8 +529,8 @@ bool TimingEvents::DoState(StateWrapper& sw) return !sw.HasError(); } -TimingEvent::TimingEvent(const std::string_view name, TickCount period, TickCount interval, - TimingEventCallback callback, void* callback_param) +TimingEvent::TimingEvent(const char* name, TickCount period, TickCount interval, TimingEventCallback callback, + void* callback_param) : m_callback(callback), m_callback_param(callback_param), m_period(period), m_interval(interval), m_name(name) { const GlobalTicks ts = TimingEvents::GetTimestampForNewEvent(); diff --git a/src/core/timing_event.h b/src/core/timing_event.h index b8e7133b3..1d7bc8e0d 100644 --- a/src/core/timing_event.h +++ b/src/core/timing_event.h @@ -15,11 +15,11 @@ using TimingEventCallback = void (*)(void* param, TickCount ticks); class TimingEvent { public: - TimingEvent(const std::string_view name, TickCount period, TickCount interval, TimingEventCallback callback, + TimingEvent(const char* name, TickCount period, TickCount interval, TimingEventCallback callback, void* callback_param); ~TimingEvent(); - ALWAYS_INLINE const std::string_view GetName() const { return m_name; } + ALWAYS_INLINE const char* GetName() const { return m_name; } ALWAYS_INLINE bool IsActive() const { return m_active; } // Returns the number of ticks between each event. @@ -71,7 +71,7 @@ public: TickCount m_interval; bool m_active = false; - std::string_view m_name; + const char* m_name; }; namespace TimingEvents { diff --git a/src/util/state_wrapper.cpp b/src/util/state_wrapper.cpp index cc8dc9ff7..447263a70 100644 --- a/src/util/state_wrapper.cpp +++ b/src/util/state_wrapper.cpp @@ -91,7 +91,7 @@ void StateWrapper::Do(SmallStringBase* value_ptr) void StateWrapper::Do(std::string_view* value_ptr) { - Assert(m_mode == Mode::Write); + DebugAssert(m_mode == Mode::Write); u32 length = static_cast(value_ptr->length()); Do(&length); DoBytes(const_cast(value_ptr->data()), length);