diff --git a/docs/SubsystemHLE.md b/docs/SubsystemHLE.md index d48efcb72b..485ee4708b 100644 --- a/docs/SubsystemHLE.md +++ b/docs/SubsystemHLE.md @@ -52,7 +52,7 @@ public: // Must be placed after all methods are defined (or declared). // Define here your functions and methods, please order them. // Use FindRequestTipc for TIPC handlers. - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSessionId"}, FunctionInfo{12, nullptr, "GetAccountId"}, FunctionInfo{13, nullptr, "GetLinkedNintendoAccountId"}, diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index c8b75d955f..8fffcdbba4 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp @@ -108,7 +108,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IManagerForSystemService::CheckAvailability>, "CheckAvailability"}, FunctionInfo{1, D<&IManagerForSystemService::GetAccountId>, "GetAccountId"}, FunctionInfo{2, nullptr, "EnsureIdTokenCacheAsync"}, @@ -152,7 +152,7 @@ public: : ServiceFramework{system_, "IFloatingRegistrationRequest"} { } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSessionId"}, FunctionInfo{12, nullptr, "GetAccountId"}, FunctionInfo{13, nullptr, "GetLinkedNintendoAccountId"}, @@ -185,7 +185,7 @@ private: rb.Push(false); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CheckAvailability"}, FunctionInfo{1, nullptr, "GetAccountId"}, FunctionInfo{2, nullptr, "EnsureIdTokenCacheAsync"}, @@ -248,7 +248,7 @@ public: : ServiceFramework{system_, "IAuthorizationRequest"} { } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSessionId"}, FunctionInfo{10, nullptr, "InvokeWithoutInteractionAsync"}, FunctionInfo{19, nullptr, "IsAuthorized"}, @@ -266,7 +266,7 @@ public: explicit IOAuthProcedure(Core::System& system_, Common::UUID) : ServiceFramework{system_, "IOAuthProcedure"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "PrepareAsync"}, FunctionInfo{1, nullptr, "GetRequest"}, FunctionInfo{2, nullptr, "ApplyResponse"}, @@ -285,7 +285,7 @@ public: : ServiceFramework{system_, "IOAuthProcedureForExternalNsa"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "PrepareAsync"}, FunctionInfo{1, nullptr, "GetRequest"}, FunctionInfo{2, nullptr, "ApplyResponse"}, @@ -308,7 +308,7 @@ public: : ServiceFramework{system_, "IOAuthProcedureForNintendoAccountLinkage"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "PrepareAsync"}, FunctionInfo{1, nullptr, "GetRequest"}, FunctionInfo{2, nullptr, "ApplyResponse"}, @@ -333,7 +333,7 @@ public: explicit INotifier(Core::System& system_, Common::UUID) : ServiceFramework{system_, "INotifier"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSystemEvent"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -574,7 +574,7 @@ protected: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IProfileCommon::Get, "Get"}, FunctionInfo{1, &IProfileCommon::GetBase, "GetBase"}, FunctionInfo{10, &IProfileCommon::GetImageSize, "GetImageSize"}, @@ -610,7 +610,7 @@ public: explicit ISessionObject(Core::System& system_, Common::UUID) : ServiceFramework{system_, "ISessionObject"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{999, nullptr, "Dummy"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -623,7 +623,7 @@ public: explicit IGuestLoginRequest(Core::System& system_, Common::UUID) : ServiceFramework{system_, "IGuestLoginRequest"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSessionId"}, FunctionInfo{11, nullptr, "Unknown"}, // 1.0.0 - 2.3.0 (the name is blank on Switchbrew) FunctionInfo{12, nullptr, "GetAccountId"}, @@ -744,7 +744,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IManagerForApplication::CheckAvailability, "CheckAvailability"}, FunctionInfo{1, &IManagerForApplication::GetAccountId, "GetAccountId"}, FunctionInfo{2, &IManagerForApplication::EnsureIdTokenCacheAsync, "EnsureIdTokenCacheAsync"}, @@ -767,7 +767,7 @@ public: explicit IAsyncNetworkServiceLicenseKindContext(Core::System& system_, Common::UUID) : ServiceFramework{system_, "IAsyncNetworkServiceLicenseKindContext"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSystemEvent"}, FunctionInfo{1, nullptr, "Cancel"}, FunctionInfo{2, nullptr, "HasDone"}, @@ -786,7 +786,7 @@ public: explicit IOAuthProcedureForUserRegistration(Core::System& system_, Common::UUID) : ServiceFramework{system_, "IOAuthProcedureForUserRegistration"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "PrepareAsync"}, FunctionInfo{1, nullptr, "GetRequest"}, FunctionInfo{2, nullptr, "ApplyResponse"}, @@ -815,7 +815,7 @@ class DAUTH_O final : public ServiceFramework { public: explicit DAUTH_O(Core::System& system_, Common::UUID) : ServiceFramework{system_, "dauth:o"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "EnsureAuthenticationTokenCacheAsync"}, FunctionInfo{1, nullptr, "LoadAuthenticationTokenCache"}, FunctionInfo{2, nullptr, "InvalidateAuthenticationTokenCache"}, @@ -841,7 +841,7 @@ public: explicit IAsyncResult(Core::System& system_, Common::UUID) : ServiceFramework{system_, "IAsyncResult"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetResult"}, FunctionInfo{1, nullptr, "Cancel"}, FunctionInfo{2, nullptr, "IsAvailable"}, @@ -1256,7 +1256,7 @@ public: } ~ACC_AA() override = default; - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "EnsureCacheAsync"}, FunctionInfo{1, nullptr, "LoadCache"}, FunctionInfo{2, nullptr, "GetDeviceAccountId"}, @@ -1276,7 +1276,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ACC_SU::GetUserCount, "GetUserCount"}, FunctionInfo{1, &ACC_SU::GetUserExistence, "GetUserExistence"}, FunctionInfo{2, &ACC_SU::ListAllUsers, "ListAllUsers"}, @@ -1352,7 +1352,7 @@ public: } ~ACC_U0() override = default; - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ACC_U0::GetUserCount, "GetUserCount"}, FunctionInfo{1, &ACC_U0::GetUserExistence, "GetUserExistence"}, FunctionInfo{2, &ACC_U0::ListAllUsers, "ListAllUsers"}, @@ -1391,7 +1391,7 @@ public: } ~ACC_U1() override = default; - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ACC_U1::GetUserCount, "GetUserCount"}, FunctionInfo{1, &ACC_U1::GetUserExistence, "GetUserExistence"}, FunctionInfo{2, &ACC_U1::ListAllUsers, "ListAllUsers"}, @@ -1439,7 +1439,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "EnsureAuthenticationTokenCacheAsync"}, FunctionInfo{1, nullptr, "LoadAuthenticationTokenCache"}, FunctionInfo{2, nullptr, "InvalidateAuthenticationTokenCache"}, @@ -1468,7 +1468,7 @@ public: explicit ACC_E(std::shared_ptr module_, std::shared_ptr profile_manager_, Core::System& system_) : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e") {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetUserCount"}, FunctionInfo{1, nullptr, "GetUserExistence"}, FunctionInfo{2, nullptr, "ListAllUsers"}, @@ -1557,7 +1557,7 @@ public: explicit ACC_E_U1(std::shared_ptr module_, std::shared_ptr profile_manager_, Core::System& system_) : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e:u1") {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetUserCount"}, FunctionInfo{1, nullptr, "GetUserExistence"}, FunctionInfo{2, nullptr, "ListAllUsers"}, @@ -1600,7 +1600,7 @@ public: explicit ACC_E_U2(std::shared_ptr module_, std::shared_ptr profile_manager_, Core::System& system_) : Interface(std::move(module_), std::move(profile_manager_), system_, "acc:e:u2") {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetUserCount"}, FunctionInfo{1, nullptr, "GetUserExistence"}, FunctionInfo{2, nullptr, "ListAllUsers"}, diff --git a/src/core/hle/service/acc/async_context.h b/src/core/hle/service/acc/async_context.h index ca0f02f0ce..a5e6eb664c 100644 --- a/src/core/hle/service/acc/async_context.h +++ b/src/core/hle/service/acc/async_context.h @@ -36,7 +36,7 @@ protected: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IAsyncContext::GetSystemEvent, "GetSystemEvent"}, FunctionInfo{1, &IAsyncContext::Cancel, "Cancel"}, FunctionInfo{2, &IAsyncContext::HasDone, "HasDone"}, diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 81f4b9d9a6..540b350c09 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -140,7 +140,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IApplicationProxy::GetCommonStateGetter>, "GetCommonStateGetter"}, FunctionInfo{1, D<&IApplicationProxy::GetSelfController>, "GetSelfController"}, FunctionInfo{2, D<&IApplicationProxy::GetWindowController>, "GetWindowController"}, @@ -187,7 +187,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IApplicationProxyService::OpenApplicationProxy>, "OpenApplicationProxy"} ); WindowSystem& m_window_system; @@ -291,7 +291,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISystemAppletProxy::GetCommonStateGetter>, "GetCommonStateGetter"}, FunctionInfo{1, D<&ISystemAppletProxy::GetSelfController>, "GetSelfController"}, FunctionInfo{2, D<&ISystemAppletProxy::GetWindowController>, "GetWindowController"}, @@ -576,7 +576,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ILibraryAppletSelfAccessor::PopInData>, "PopInData"}, FunctionInfo{1, D<&ILibraryAppletSelfAccessor::PushOutData>, "PushOutData"}, FunctionInfo{2, D<&ILibraryAppletSelfAccessor::PopInteractiveInData>, "PopInteractiveInData"}, @@ -717,7 +717,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ILibraryAppletProxy::GetCommonStateGetter>, "GetCommonStateGetter"}, FunctionInfo{1, D<&ILibraryAppletProxy::GetSelfController>, "GetSelfController"}, FunctionInfo{2, D<&ILibraryAppletProxy::GetWindowController>, "GetWindowController"}, @@ -827,7 +827,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IOverlayAppletProxy::GetCommonStateGetter>, "GetCommonStateGetter"}, FunctionInfo{1, D<&IOverlayAppletProxy::GetSelfController>, "GetSelfController"}, FunctionInfo{2, D<&IOverlayAppletProxy::GetWindowController>, "GetWindowController"}, @@ -1096,7 +1096,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ILibraryAppletCreator::CreateLibraryApplet>, "CreateLibraryApplet"}, FunctionInfo{1, nullptr, "TerminateAllLibraryApplets"}, FunctionInfo{2, nullptr, "AreAnyLibraryAppletsLeft"}, @@ -1207,7 +1207,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{100, D<&IAllSystemAppletProxiesService::OpenSystemAppletProxy>, "OpenSystemAppletProxy"}, FunctionInfo{110, D<&IAllSystemAppletProxiesService::OpenSystemAppletProxy>, "OpenSystemAppletProxyEx"}, FunctionInfo{200, D<&IAllSystemAppletProxiesService::OpenLibraryAppletProxyOld>, "OpenLibraryAppletProxyOld"}, diff --git a/src/core/hle/service/am/service/applet_common_functions.cpp b/src/core/hle/service/am/service/applet_common_functions.cpp index 7df92cc3c6..92f3ceda96 100644 --- a/src/core/hle/service/am/service/applet_common_functions.cpp +++ b/src/core/hle/service/am/service/applet_common_functions.cpp @@ -13,7 +13,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IAppletCommonFunctions::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetTerminateResult"}, FunctionInfo{10, nullptr, "ReadThemeStorage"}, FunctionInfo{11, nullptr, "WriteThemeStorage"}, diff --git a/src/core/hle/service/am/service/application_accessor.cpp b/src/core/hle/service/am/service/application_accessor.cpp index b84daf445a..df35700db1 100644 --- a/src/core/hle/service/am/service/application_accessor.cpp +++ b/src/core/hle/service/am/service/application_accessor.cpp @@ -19,7 +19,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IApplicationAccessor::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IApplicationAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"}, FunctionInfo{1, nullptr, "IsCompleted"}, FunctionInfo{10, D<&IApplicationAccessor::Start>, "Start"}, diff --git a/src/core/hle/service/am/service/application_creator.cpp b/src/core/hle/service/am/service/application_creator.cpp index 133a279b15..687cde587c 100644 --- a/src/core/hle/service/am/service/application_creator.cpp +++ b/src/core/hle/service/am/service/application_creator.cpp @@ -21,7 +21,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IApplicationCreator::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IApplicationCreator::CreateApplication>, "CreateApplication"}, FunctionInfo{1, nullptr, "PopLaunchRequestedApplication"}, FunctionInfo{10, D<&IApplicationCreator::CreateSystemApplication>, "CreateSystemApplication"}, diff --git a/src/core/hle/service/am/service/application_functions.cpp b/src/core/hle/service/am/service/application_functions.cpp index c49f8cbc61..b8b68055b5 100644 --- a/src/core/hle/service/am/service/application_functions.cpp +++ b/src/core/hle/service/am/service/application_functions.cpp @@ -52,7 +52,7 @@ FileSys::PatchManager::Metadata GetApplicationMetadata(Core::System& system, u64 } // Anonymous namespace ServiceFrameworkBase::FunctionInfoBase const* IApplicationFunctions::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, D<&IApplicationFunctions::PopLaunchParameter>, "PopLaunchParameter"}, FunctionInfo{10, nullptr, "CreateApplicationAndPushAndRequestToStart"}, FunctionInfo{11, nullptr, "CreateApplicationAndPushAndRequestToStartForQuest"}, diff --git a/src/core/hle/service/am/service/audio_controller.cpp b/src/core/hle/service/am/service/audio_controller.cpp index 8f7b8867ad..9679bea325 100644 --- a/src/core/hle/service/am/service/audio_controller.cpp +++ b/src/core/hle/service/am/service/audio_controller.cpp @@ -10,7 +10,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IAudioController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioController::SetExpectedMasterVolume>, "SetExpectedMasterVolume"}, FunctionInfo{1, D<&IAudioController::GetMainAppletExpectedMasterVolume>, "GetMainAppletExpectedMasterVolume"}, FunctionInfo{2, D<&IAudioController::GetLibraryAppletExpectedMasterVolume>, "GetLibraryAppletExpectedMasterVolume"}, diff --git a/src/core/hle/service/am/service/common_state_getter.cpp b/src/core/hle/service/am/service/common_state_getter.cpp index 8e65ffd97f..8e5b854ce9 100644 --- a/src/core/hle/service/am/service/common_state_getter.cpp +++ b/src/core/hle/service/am/service/common_state_getter.cpp @@ -18,7 +18,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* ICommonStateGetter::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ICommonStateGetter::GetEventHandle>, "GetEventHandle"}, FunctionInfo{1, D<&ICommonStateGetter::ReceiveMessage>, "ReceiveMessage"}, FunctionInfo{2, nullptr, "GetThisAppletKind"}, @@ -144,7 +144,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, D<&ILockAccessor::TryLock>, "TryLock"}, FunctionInfo{2, D<&ILockAccessor::Unlock>, "Unlock"}, FunctionInfo{3, D<&ILockAccessor::GetEvent>, "GetEvent"}, diff --git a/src/core/hle/service/am/service/cradle_firmware_updater.cpp b/src/core/hle/service/am/service/cradle_firmware_updater.cpp index 7b8ef3b618..6a1a1bce14 100644 --- a/src/core/hle/service/am/service/cradle_firmware_updater.cpp +++ b/src/core/hle/service/am/service/cradle_firmware_updater.cpp @@ -10,7 +10,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* ICradleFirmwareUpdater::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ICradleFirmwareUpdater::StartUpdate>, "StartUpdate"}, FunctionInfo{1, D<&ICradleFirmwareUpdater::FinishUpdate>, "FinishUpdate"}, FunctionInfo{2, D<&ICradleFirmwareUpdater::GetCradleDeviceInfo>, "GetCradleDeviceInfo"}, diff --git a/src/core/hle/service/am/service/debug_functions.h b/src/core/hle/service/am/service/debug_functions.h index 7ef6995279..f9064a94e0 100644 --- a/src/core/hle/service/am/service/debug_functions.h +++ b/src/core/hle/service/am/service/debug_functions.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "NotifyMessageToHomeMenuForDebug"}, FunctionInfo{1, nullptr, "OpenMainApplication"}, FunctionInfo{10, nullptr, "PerformSystemButtonPressing"}, diff --git a/src/core/hle/service/am/service/display_controller.cpp b/src/core/hle/service/am/service/display_controller.cpp index 21c68188c0..40db3d1184 100644 --- a/src/core/hle/service/am/service/display_controller.cpp +++ b/src/core/hle/service/am/service/display_controller.cpp @@ -13,7 +13,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IDisplayController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetLastForegroundCaptureImage"}, FunctionInfo{1, nullptr, "UpdateLastForegroundCaptureImage"}, FunctionInfo{2, nullptr, "GetLastApplicationCaptureImage"}, diff --git a/src/core/hle/service/am/service/global_state_controller.cpp b/src/core/hle/service/am/service/global_state_controller.cpp index f629f00624..ad5cd0ed31 100644 --- a/src/core/hle/service/am/service/global_state_controller.cpp +++ b/src/core/hle/service/am/service/global_state_controller.cpp @@ -11,7 +11,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IGlobalStateController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestToEnterSleep"}, FunctionInfo{1, nullptr, "EnterSleep"}, FunctionInfo{2, nullptr, "StartSleepSequence"}, diff --git a/src/core/hle/service/am/service/home_menu_functions.cpp b/src/core/hle/service/am/service/home_menu_functions.cpp index 779ddbec67..00f127314a 100644 --- a/src/core/hle/service/am/service/home_menu_functions.cpp +++ b/src/core/hle/service/am/service/home_menu_functions.cpp @@ -15,7 +15,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IHomeMenuFunctions::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{10, D<&IHomeMenuFunctions::RequestToGetForeground>, "RequestToGetForeground"}, FunctionInfo{11, D<&IHomeMenuFunctions::LockForeground>, "LockForeground"}, FunctionInfo{12, D<&IHomeMenuFunctions::UnlockForeground>, "UnlockForeground"}, diff --git a/src/core/hle/service/am/service/library_applet_accessor.cpp b/src/core/hle/service/am/service/library_applet_accessor.cpp index 44a731d840..852220902d 100644 --- a/src/core/hle/service/am/service/library_applet_accessor.cpp +++ b/src/core/hle/service/am/service/library_applet_accessor.cpp @@ -46,7 +46,7 @@ static void ReplaceEmptyUuidWithCurrentUser(const std::shared_ptr, "GetAppletStateChangedEvent"}, FunctionInfo{1, D<&ILibraryAppletAccessor::IsCompleted>, "IsCompleted"}, FunctionInfo{10, D<&ILibraryAppletAccessor::Start>, "Start"}, diff --git a/src/core/hle/service/am/service/overlay_functions.cpp b/src/core/hle/service/am/service/overlay_functions.cpp index 0f7d3a4120..5dcdaaab43 100644 --- a/src/core/hle/service/am/service/overlay_functions.cpp +++ b/src/core/hle/service/am/service/overlay_functions.cpp @@ -9,7 +9,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IOverlayFunctions::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IOverlayFunctions::BeginToWatchShortHomeButtonMessage>, "BeginToWatchShortHomeButtonMessage"}, FunctionInfo{1, D<&IOverlayFunctions::EndToWatchShortHomeButtonMessage>, "EndToWatchShortHomeButtonMessage"}, FunctionInfo{2, D<&IOverlayFunctions::GetApplicationIdForLogo>, "GetApplicationIdForLogo"}, diff --git a/src/core/hle/service/am/service/process_winding_controller.cpp b/src/core/hle/service/am/service/process_winding_controller.cpp index e559ec6e89..33792b20bf 100644 --- a/src/core/hle/service/am/service/process_winding_controller.cpp +++ b/src/core/hle/service/am/service/process_winding_controller.cpp @@ -14,7 +14,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IProcessWindingController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IProcessWindingController::GetLaunchReason>, "GetLaunchReason"}, FunctionInfo{11, D<&IProcessWindingController::OpenCallingLibraryApplet>, "OpenCallingLibraryApplet"}, FunctionInfo{21, D<&IProcessWindingController::PushContext>, "PushContext"}, diff --git a/src/core/hle/service/am/service/self_controller.cpp b/src/core/hle/service/am/service/self_controller.cpp index 3f56401fc6..eee7a6034e 100644 --- a/src/core/hle/service/am/service/self_controller.cpp +++ b/src/core/hle/service/am/service/self_controller.cpp @@ -18,7 +18,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* ISelfController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISelfController::Exit>, "Exit"}, FunctionInfo{1, D<&ISelfController::LockExit>, "LockExit"}, FunctionInfo{2, D<&ISelfController::UnlockExit>, "UnlockExit"}, diff --git a/src/core/hle/service/am/service/storage.cpp b/src/core/hle/service/am/service/storage.cpp index fcd2ffdc51..9b51933881 100644 --- a/src/core/hle/service/am/service/storage.cpp +++ b/src/core/hle/service/am/service/storage.cpp @@ -13,7 +13,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IStorage::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IStorage::Open>, "Open"}, FunctionInfo{1, D<&IStorage::OpenTransferStorage>, "OpenTransferStorage"} ); diff --git a/src/core/hle/service/am/service/storage_accessor.cpp b/src/core/hle/service/am/service/storage_accessor.cpp index ff8d40ee05..fa55a826f0 100644 --- a/src/core/hle/service/am/service/storage_accessor.cpp +++ b/src/core/hle/service/am/service/storage_accessor.cpp @@ -12,7 +12,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IStorageAccessor::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IStorageAccessor::GetSize>, "GetSize"}, FunctionInfo{10, D<&IStorageAccessor::Write>, "Write"}, FunctionInfo{11, D<&IStorageAccessor::Read>, "Read"} @@ -44,7 +44,7 @@ Result IStorageAccessor::Read(OutBuffer out_buffer, s } ServiceFrameworkBase::FunctionInfoBase const* ITransferStorageAccessor::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ITransferStorageAccessor::GetSize>, "GetSize"}, FunctionInfo{1, D<&ITransferStorageAccessor::GetHandle>, "GetHandle"} ); diff --git a/src/core/hle/service/am/service/window_controller.cpp b/src/core/hle/service/am/service/window_controller.cpp index 87402b9402..3c4d516e0e 100644 --- a/src/core/hle/service/am/service/window_controller.cpp +++ b/src/core/hle/service/am/service/window_controller.cpp @@ -13,7 +13,7 @@ namespace Service::AM { ServiceFrameworkBase::FunctionInfoBase const* IWindowController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateWindow"}, FunctionInfo{1, D<&IWindowController::GetAppletResourceUserId>, "GetAppletResourceUserId"}, FunctionInfo{2, D<&IWindowController::GetAppletResourceUserIdOfCallerApplet>, "GetAppletResourceUserIdOfCallerApplet"}, diff --git a/src/core/hle/service/aoc/addon_content_manager.cpp b/src/core/hle/service/aoc/addon_content_manager.cpp index 627e33d644..434c758dfc 100644 --- a/src/core/hle/service/aoc/addon_content_manager.cpp +++ b/src/core/hle/service/aoc/addon_content_manager.cpp @@ -29,7 +29,7 @@ namespace Service::AOC { ServiceFrameworkBase::FunctionInfoBase const* IAddOnContentManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CountAddOnContentByApplicationId"}, FunctionInfo{1, nullptr, "ListAddOnContentByApplicationId"}, FunctionInfo{2, D<&IAddOnContentManager::CountAddOnContent>, "CountAddOnContent"}, diff --git a/src/core/hle/service/aoc/purchase_event_manager.cpp b/src/core/hle/service/aoc/purchase_event_manager.cpp index c862685492..0eb7592f19 100644 --- a/src/core/hle/service/aoc/purchase_event_manager.cpp +++ b/src/core/hle/service/aoc/purchase_event_manager.cpp @@ -12,7 +12,7 @@ namespace Service::AOC { constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400}; ServiceFrameworkBase::FunctionInfoBase const* IPurchaseEventManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"}, FunctionInfo{1, D<&IPurchaseEventManager::SetDeliveryTarget>, "SetDeliveryTarget"}, FunctionInfo{2, D<&IPurchaseEventManager::GetPurchasedEvent>, "GetPurchasedEvent"}, diff --git a/src/core/hle/service/apm/apm_interface.cpp b/src/core/hle/service/apm/apm_interface.cpp index ae8fa348c7..b5b2b03fc4 100644 --- a/src/core/hle/service/apm/apm_interface.cpp +++ b/src/core/hle/service/apm/apm_interface.cpp @@ -56,7 +56,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ISession::SetPerformanceConfiguration, "SetPerformanceConfiguration"}, FunctionInfo{1, &ISession::GetPerformanceConfiguration, "GetPerformanceConfiguration"}, FunctionInfo{2, &ISession::SetCpuOverclockEnabled, "SetCpuOverclockEnabled"} diff --git a/src/core/hle/service/apm/apm_interface.h b/src/core/hle/service/apm/apm_interface.h index f27933ddec..000c7fd6da 100644 --- a/src/core/hle/service/apm/apm_interface.h +++ b/src/core/hle/service/apm/apm_interface.h @@ -27,7 +27,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &APM::OpenSession, "OpenSession"}, FunctionInfo{1, &APM::GetPerformanceMode, "GetPerformanceMode"}, FunctionInfo{6, &APM::IsCpuOverclockEnabled, "IsCpuOverclockEnabled"} @@ -50,7 +50,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestPerformanceMode"}, FunctionInfo{1, &APM_Sys::GetPerformanceEvent, "GetPerformanceEvent"}, FunctionInfo{2, nullptr, "GetThrottlingState"}, diff --git a/src/core/hle/service/audio/audio.cpp b/src/core/hle/service/audio/audio.cpp index 0d45a749b1..e2bba36546 100644 --- a/src/core/hle/service/audio/audio.cpp +++ b/src/core/hle/service/audio/audio.cpp @@ -23,7 +23,7 @@ public: explicit IAudioOutManagerForApplet(Core::System& system_) : ServiceFramework{system_, "audout:a"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"}, FunctionInfo{2, nullptr, "GetProcessMasterVolume"}, @@ -41,7 +41,7 @@ public: explicit IAudioSnoopManager(Core::System& system_) : ServiceFramework{system_, "auddev"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetDspStatistics"}, FunctionInfo{1, nullptr, "GetAppletStateSummaries"}, FunctionInfo{2, nullptr, "SetDspStatisticsParameter"}, @@ -58,7 +58,7 @@ public: explicit IAudioInManagerForApplet(Core::System& system_) : ServiceFramework{system_, "audin:a"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"}, FunctionInfo{2, nullptr, "GetProcessMasterVolume"}, @@ -74,7 +74,7 @@ public: explicit IAudioRendererManagerForApplet(Core::System& system_) : ServiceFramework{system_, "audren:a"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"}, FunctionInfo{2, nullptr, "GetProcessMasterVolume"}, @@ -94,7 +94,7 @@ public: explicit IAudioOutManagerForDebugger(Core::System& system_) : ServiceFramework{system_, "audout:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"} ); @@ -108,7 +108,7 @@ public: explicit IAudioInManagerForDebugger(Core::System& system_) : ServiceFramework{system_, "audin:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"} ); @@ -122,7 +122,7 @@ public: explicit IFinalOutputRecorderManagerForDebugger(Core::System& system_) : ServiceFramework{system_, "audrec:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"} ); @@ -136,7 +136,7 @@ public: explicit IAudioRendererManagerForDebugger(Core::System& system_) : ServiceFramework{system_, "audren:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"} ); @@ -150,7 +150,7 @@ public: explicit IAudioSystemManagerForApplet(Core::System& system_) : ServiceFramework{system_, "aud:a"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RegisterAppletResourceUserId"}, FunctionInfo{1, nullptr, "UnregisterAppletResourceUserId"}, FunctionInfo{2, nullptr, "RequestSuspendAudio"}, @@ -173,7 +173,7 @@ public: explicit IAudioSystemManagerForDebugger(Core::System& system_) : ServiceFramework{system_, "aud:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspendAudioForDebug"}, FunctionInfo{1, nullptr, "RequestResumeAudioForDebug"} ); diff --git a/src/core/hle/service/audio/audio_controller.cpp b/src/core/hle/service/audio/audio_controller.cpp index 15e10cdc75..d66bf9a5f9 100644 --- a/src/core/hle/service/audio/audio_controller.cpp +++ b/src/core/hle/service/audio/audio_controller.cpp @@ -21,7 +21,7 @@ namespace Service::Audio { ServiceFrameworkBase::FunctionInfoBase const* IAudioController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioController::GetTargetVolume>, "GetTargetVolume"}, FunctionInfo{1, D<&IAudioController::SetTargetVolume>, "SetTargetVolume"}, FunctionInfo{2, D<&IAudioController::GetTargetVolumeMin>, "GetTargetVolumeMin"}, diff --git a/src/core/hle/service/audio/audio_device.cpp b/src/core/hle/service/audio/audio_device.cpp index 12d37fee20..61cda0de1f 100644 --- a/src/core/hle/service/audio/audio_device.cpp +++ b/src/core/hle/service/audio/audio_device.cpp @@ -13,7 +13,7 @@ namespace Service::Audio { using namespace AudioCore::Renderer; ServiceFrameworkBase::FunctionInfoBase const* IAudioDevice::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioDevice::ListAudioDeviceName>, "ListAudioDeviceName"}, FunctionInfo{1, D<&IAudioDevice::SetAudioDeviceOutputVolume>, "SetAudioDeviceOutputVolume"}, FunctionInfo{2, D<&IAudioDevice::GetAudioDeviceOutputVolume>, "GetAudioDeviceOutputVolume"}, diff --git a/src/core/hle/service/audio/audio_in.cpp b/src/core/hle/service/audio/audio_in.cpp index 704deb2f3e..24eab7b058 100644 --- a/src/core/hle/service/audio/audio_in.cpp +++ b/src/core/hle/service/audio/audio_in.cpp @@ -12,7 +12,7 @@ namespace Service::Audio { using namespace AudioCore::AudioIn; ServiceFrameworkBase::FunctionInfoBase const* IAudioIn::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioIn::GetAudioInState>, "GetAudioInState"}, FunctionInfo{1, D<&IAudioIn::Start>, "Start"}, FunctionInfo{2, D<&IAudioIn::Stop>, "Stop"}, diff --git a/src/core/hle/service/audio/audio_in_manager.cpp b/src/core/hle/service/audio/audio_in_manager.cpp index 859c1c7c44..266cd85fc4 100644 --- a/src/core/hle/service/audio/audio_in_manager.cpp +++ b/src/core/hle/service/audio/audio_in_manager.cpp @@ -13,7 +13,7 @@ namespace Service::Audio { using namespace AudioCore::AudioIn; ServiceFrameworkBase::FunctionInfoBase const* IAudioInManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioInManager::ListAudioIns>, "ListAudioIns"}, FunctionInfo{1, D<&IAudioInManager::OpenAudioIn>, "OpenAudioIn"}, FunctionInfo{2, D<&IAudioInManager::ListAudioIns>, "ListAudioInsAuto"}, diff --git a/src/core/hle/service/audio/audio_out.cpp b/src/core/hle/service/audio/audio_out.cpp index 49765fb3f9..b6f6bcaf00 100644 --- a/src/core/hle/service/audio/audio_out.cpp +++ b/src/core/hle/service/audio/audio_out.cpp @@ -16,7 +16,7 @@ namespace Service::Audio { using namespace AudioCore::AudioOut; ServiceFrameworkBase::FunctionInfoBase const* IAudioOut::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioOut::GetAudioOutState>, "GetAudioOutState"}, FunctionInfo{1, D<&IAudioOut::Start>, "Start"}, FunctionInfo{2, D<&IAudioOut::Stop>, "Stop"}, diff --git a/src/core/hle/service/audio/audio_out_manager.cpp b/src/core/hle/service/audio/audio_out_manager.cpp index d7d2d22ec6..a34c1410e2 100644 --- a/src/core/hle/service/audio/audio_out_manager.cpp +++ b/src/core/hle/service/audio/audio_out_manager.cpp @@ -14,7 +14,7 @@ namespace Service::Audio { using namespace AudioCore::AudioOut; ServiceFrameworkBase::FunctionInfoBase const* IAudioOutManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioOutManager::ListAudioOuts>, "ListAudioOuts"}, FunctionInfo{1, D<&IAudioOutManager::OpenAudioOut>, "OpenAudioOut"}, FunctionInfo{2, D<&IAudioOutManager::ListAudioOutsAuto>, "ListAudioOutsAuto"}, diff --git a/src/core/hle/service/audio/audio_renderer.cpp b/src/core/hle/service/audio/audio_renderer.cpp index d2a8756f66..141f9d6472 100644 --- a/src/core/hle/service/audio/audio_renderer.cpp +++ b/src/core/hle/service/audio/audio_renderer.cpp @@ -11,7 +11,7 @@ namespace Service::Audio { using namespace AudioCore::Renderer; ServiceFrameworkBase::FunctionInfoBase const* IAudioRenderer::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioRenderer::GetSampleRate>, "GetSampleRate"}, FunctionInfo{1, D<&IAudioRenderer::GetSampleCount>, "GetSampleCount"}, FunctionInfo{2, D<&IAudioRenderer::GetMixBufferCount>, "GetMixBufferCount"}, diff --git a/src/core/hle/service/audio/audio_renderer_manager.cpp b/src/core/hle/service/audio/audio_renderer_manager.cpp index 2817a76c0e..cb35da1bf2 100644 --- a/src/core/hle/service/audio/audio_renderer_manager.cpp +++ b/src/core/hle/service/audio/audio_renderer_manager.cpp @@ -19,7 +19,7 @@ namespace Service::Audio { using namespace AudioCore::Renderer; ServiceFrameworkBase::FunctionInfoBase const* IAudioRendererManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAudioRendererManager::OpenAudioRenderer>, "OpenAudioRenderer"}, FunctionInfo{1, D<&IAudioRendererManager::GetWorkBufferSize>, "GetWorkBufferSize"}, FunctionInfo{2, D<&IAudioRendererManager::GetAudioDeviceService>, "GetAudioDeviceService"}, diff --git a/src/core/hle/service/audio/final_output_recorder_manager.cpp b/src/core/hle/service/audio/final_output_recorder_manager.cpp index b014df55df..32951eecdb 100644 --- a/src/core/hle/service/audio/final_output_recorder_manager.cpp +++ b/src/core/hle/service/audio/final_output_recorder_manager.cpp @@ -13,7 +13,7 @@ public: explicit IFinalOutputRecorder(Core::System& system_) : ServiceFramework{system_, "IFinalOutputRecorder"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetFinalOutputRecorderState"}, FunctionInfo{1, nullptr, "Start"}, FunctionInfo{2, nullptr, "Stop"}, diff --git a/src/core/hle/service/audio/final_output_recorder_manager.h b/src/core/hle/service/audio/final_output_recorder_manager.h index 2f5f20a9e7..e50640b1a2 100644 --- a/src/core/hle/service/audio/final_output_recorder_manager.h +++ b/src/core/hle/service/audio/final_output_recorder_manager.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenFinalOutputRecorder"} ); }; diff --git a/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h index 126f600d2e..15d1e3452a 100644 --- a/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h +++ b/src/core/hle/service/audio/final_output_recorder_manager_for_applet.h @@ -23,7 +23,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestSuspend"}, FunctionInfo{1, nullptr, "RequestResume"} ); diff --git a/src/core/hle/service/audio/hardware_opus_decoder.cpp b/src/core/hle/service/audio/hardware_opus_decoder.cpp index 5591813452..81bce1702b 100644 --- a/src/core/hle/service/audio/hardware_opus_decoder.cpp +++ b/src/core/hle/service/audio/hardware_opus_decoder.cpp @@ -12,7 +12,7 @@ namespace Service::Audio { using namespace AudioCore::OpusDecoder; ServiceFrameworkBase::FunctionInfoBase const* IHardwareOpusDecoder::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IHardwareOpusDecoder::DecodeInterleavedOld>, "DecodeInterleavedOld"}, FunctionInfo{1, D<&IHardwareOpusDecoder::SetContext>, "SetContext"}, FunctionInfo{2, D<&IHardwareOpusDecoder::DecodeInterleavedForMultiStreamOld>, "DecodeInterleavedForMultiStreamOld"}, diff --git a/src/core/hle/service/audio/hardware_opus_decoder_manager.cpp b/src/core/hle/service/audio/hardware_opus_decoder_manager.cpp index f5d78d6405..09ef12ae4f 100644 --- a/src/core/hle/service/audio/hardware_opus_decoder_manager.cpp +++ b/src/core/hle/service/audio/hardware_opus_decoder_manager.cpp @@ -13,7 +13,7 @@ namespace Service::Audio { using namespace AudioCore::OpusDecoder; ServiceFrameworkBase::FunctionInfoBase const* IHardwareOpusDecoderManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IHardwareOpusDecoderManager::OpenHardwareOpusDecoder>, "OpenHardwareOpusDecoder"}, FunctionInfo{1, D<&IHardwareOpusDecoderManager::GetWorkBufferSize>, "GetWorkBufferSize"}, FunctionInfo{2, D<&IHardwareOpusDecoderManager::OpenHardwareOpusDecoderForMultiStream>, "OpenOpusDecoderForMultiStream"}, diff --git a/src/core/hle/service/bcat/bcat_service.cpp b/src/core/hle/service/bcat/bcat_service.cpp index 3c067d7424..0610e4f0c9 100644 --- a/src/core/hle/service/bcat/bcat_service.cpp +++ b/src/core/hle/service/bcat/bcat_service.cpp @@ -25,7 +25,7 @@ static u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) { } ServiceFrameworkBase::FunctionInfoBase const* IBcatService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{10100, D<&IBcatService::RequestSyncDeliveryCache>, "RequestSyncDeliveryCache"}, FunctionInfo{10101, D<&IBcatService::RequestSyncDeliveryCacheWithDirectoryName>, "RequestSyncDeliveryCacheWithDirectoryName"}, FunctionInfo{10200, nullptr, "CancelSyncDeliveryCacheRequest"}, diff --git a/src/core/hle/service/bcat/delivery_cache_directory_service.cpp b/src/core/hle/service/bcat/delivery_cache_directory_service.cpp index 7f446c1151..7e855661d9 100644 --- a/src/core/hle/service/bcat/delivery_cache_directory_service.cpp +++ b/src/core/hle/service/bcat/delivery_cache_directory_service.cpp @@ -28,7 +28,7 @@ static BcatDigest DigestFile(const FileSys::VirtualFile& file) { } ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheDirectoryService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDeliveryCacheDirectoryService::Open>, "Open"}, FunctionInfo{1, D<&IDeliveryCacheDirectoryService::Read>, "Read"}, FunctionInfo{2, D<&IDeliveryCacheDirectoryService::GetCount>, "GetCount"} diff --git a/src/core/hle/service/bcat/delivery_cache_file_service.cpp b/src/core/hle/service/bcat/delivery_cache_file_service.cpp index 404fa91e88..37c401355d 100644 --- a/src/core/hle/service/bcat/delivery_cache_file_service.cpp +++ b/src/core/hle/service/bcat/delivery_cache_file_service.cpp @@ -13,7 +13,7 @@ namespace Service::BCAT { ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheFileService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDeliveryCacheFileService::Open>, "Open"}, FunctionInfo{1, D<&IDeliveryCacheFileService::Read>, "Read"}, FunctionInfo{2, D<&IDeliveryCacheFileService::GetSize>, "GetSize"}, diff --git a/src/core/hle/service/bcat/delivery_cache_progress_service.cpp b/src/core/hle/service/bcat/delivery_cache_progress_service.cpp index 1e9932785f..29e893120c 100644 --- a/src/core/hle/service/bcat/delivery_cache_progress_service.cpp +++ b/src/core/hle/service/bcat/delivery_cache_progress_service.cpp @@ -11,7 +11,7 @@ namespace Service::BCAT { ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheProgressService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDeliveryCacheProgressService::GetEvent>, "GetEvent"}, FunctionInfo{1, D<&IDeliveryCacheProgressService::GetImpl>, "GetImpl"} ); diff --git a/src/core/hle/service/bcat/delivery_cache_storage_service.cpp b/src/core/hle/service/bcat/delivery_cache_storage_service.cpp index 85f05a49df..b73113bf19 100644 --- a/src/core/hle/service/bcat/delivery_cache_storage_service.cpp +++ b/src/core/hle/service/bcat/delivery_cache_storage_service.cpp @@ -13,7 +13,7 @@ namespace Service::BCAT { ServiceFrameworkBase::FunctionInfoBase const* IDeliveryCacheStorageService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDeliveryCacheStorageService::CreateFileService>, "CreateFileService"}, FunctionInfo{1, D<&IDeliveryCacheStorageService::CreateDirectoryService>, "CreateDirectoryService"}, FunctionInfo{10, D<&IDeliveryCacheStorageService::EnumerateDeliveryCacheDirectory>, "EnumerateDeliveryCacheDirectory"} diff --git a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp index f5b25920de..f945957e67 100644 --- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp +++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp @@ -10,7 +10,7 @@ namespace Service::News { ServiceFrameworkBase::FunctionInfoBase const* INewlyArrivedEventHolder::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&INewlyArrivedEventHolder::Get>, "Get"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/bcat/news/news_data_service.cpp b/src/core/hle/service/bcat/news/news_data_service.cpp index f54eff6175..db14bba80c 100644 --- a/src/core/hle/service/bcat/news/news_data_service.cpp +++ b/src/core/hle/service/bcat/news/news_data_service.cpp @@ -25,7 +25,7 @@ std::string_view ToStringView(std::span buf) { } // namespace ServiceFrameworkBase::FunctionInfoBase const* INewsDataService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&INewsDataService::Open>, "Open"}, FunctionInfo{1, D<&INewsDataService::OpenWithNewsRecordV1>, "OpenWithNewsRecordV1"}, FunctionInfo{2, D<&INewsDataService::Read>, "Read"}, diff --git a/src/core/hle/service/bcat/news/news_database_service.cpp b/src/core/hle/service/bcat/news/news_database_service.cpp index dc1af7b461..2e926b72a9 100644 --- a/src/core/hle/service/bcat/news/news_database_service.cpp +++ b/src/core/hle/service/bcat/news/news_database_service.cpp @@ -46,7 +46,7 @@ bool UpdateField(NewsRecord& rec, std::string_view column, s32 value, bool addit } // namespace ServiceFrameworkBase::FunctionInfoBase const* INewsDatabaseService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&INewsDatabaseService::GetListV1>, "GetListV1"}, FunctionInfo{1, D<&INewsDatabaseService::Count>, "Count"}, FunctionInfo{2, D<&INewsDatabaseService::CountWithKey>, "CountWithKey"}, diff --git a/src/core/hle/service/bcat/news/news_service.cpp b/src/core/hle/service/bcat/news/news_service.cpp index bca0f5000b..d49987399f 100644 --- a/src/core/hle/service/bcat/news/news_service.cpp +++ b/src/core/hle/service/bcat/news/news_service.cpp @@ -13,7 +13,7 @@ namespace Service::News { ServiceFrameworkBase::FunctionInfoBase const* INewsService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{10100, D<&INewsService::PostLocalNews>, "PostLocalNews"}, FunctionInfo{20100, D<&INewsService::SetPassphrase>, "SetPassphrase"}, FunctionInfo{30100, D<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"}, diff --git a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp index 9fba3c8ff2..ce97a1f6fc 100644 --- a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp +++ b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp @@ -10,7 +10,7 @@ namespace Service::News { ServiceFrameworkBase::FunctionInfoBase const* IOverwriteEventHolder::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IOverwriteEventHolder::Get>, "Get"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/bcat/news/service_creator.cpp b/src/core/hle/service/bcat/news/service_creator.cpp index c5de719b26..febdb2f3d6 100644 --- a/src/core/hle/service/bcat/news/service_creator.cpp +++ b/src/core/hle/service/bcat/news/service_creator.cpp @@ -15,7 +15,7 @@ namespace Service::News { ServiceFrameworkBase::FunctionInfoBase const* IServiceCreator::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IServiceCreator::CreateNewsService>, "CreateNewsService"}, FunctionInfo{1, D<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"}, FunctionInfo{2, D<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"}, diff --git a/src/core/hle/service/bcat/service_creator.cpp b/src/core/hle/service/bcat/service_creator.cpp index 998b2b441f..dd47dc6d11 100644 --- a/src/core/hle/service/bcat/service_creator.cpp +++ b/src/core/hle/service/bcat/service_creator.cpp @@ -14,7 +14,7 @@ namespace Service::BCAT { ServiceFrameworkBase::FunctionInfoBase const* IServiceCreator::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IServiceCreator::CreateBcatService>, "CreateBcatService"}, FunctionInfo{1, D<&IServiceCreator::CreateDeliveryCacheStorageService>, "CreateDeliveryCacheStorageService"}, FunctionInfo{2, D<&IServiceCreator::CreateDeliveryCacheStorageServiceWithApplicationId>, "CreateDeliveryCacheStorageServiceWithApplicationId"}, diff --git a/src/core/hle/service/bpc/bpc.cpp b/src/core/hle/service/bpc/bpc.cpp index fe67b4df73..7547bee7b3 100644 --- a/src/core/hle/service/bpc/bpc.cpp +++ b/src/core/hle/service/bpc/bpc.cpp @@ -16,7 +16,7 @@ class BPC final : public ServiceFramework { public: explicit BPC(Core::System& system_) : ServiceFramework{system_, "bpc"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ShutdownSystem"}, FunctionInfo{1, nullptr, "RebootSystem"}, FunctionInfo{2, nullptr, "GetWakeupReason"}, @@ -43,7 +43,7 @@ class BPC_R final : public ServiceFramework { public: explicit BPC_R(Core::System& system_) : ServiceFramework{system_, "bpc:r"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetRtcTime"}, FunctionInfo{1, nullptr, "SetRtcTime"}, FunctionInfo{2, nullptr, "GetRtcResetDetected"}, @@ -59,7 +59,7 @@ class BPC_C final : public ServiceFramework { public: explicit BPC_C(Core::System& system_) : ServiceFramework{system_, "bpc:c"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ShutdownSystem"}, FunctionInfo{1, nullptr, "RebootSystem"}, FunctionInfo{2, nullptr, "GetWakeupReason"}, @@ -76,7 +76,7 @@ class BPC_B final : public ServiceFramework { public: explicit BPC_B(Core::System& system_) : ServiceFramework{system_, "bpc:b"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSleepButtonState"}, FunctionInfo{1, nullptr, "GetPowerButtonEvent"} ); @@ -89,7 +89,7 @@ class BPC_W final : public ServiceFramework { public: explicit BPC_W(Core::System& system_) : ServiceFramework{system_, "bpc:w"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateWakeupTimer"}, FunctionInfo{1, nullptr, "CancelWakeupTimer"}, FunctionInfo{2, nullptr, "EnableWakeupTimerOnDevice"} @@ -103,7 +103,7 @@ class BPC_AMS final : public ServiceFramework { public: explicit BPC_AMS(Core::System& system_) : ServiceFramework{system_, "bpc:ams"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{65000, nullptr, "RebootToFatalError"}, FunctionInfo{65001, nullptr, "SetRebootPayload"} ); diff --git a/src/core/hle/service/btdrv/btdrv.cpp b/src/core/hle/service/btdrv/btdrv.cpp index 4f41f1a79f..7693abbbef 100644 --- a/src/core/hle/service/btdrv/btdrv.cpp +++ b/src/core/hle/service/btdrv/btdrv.cpp @@ -41,7 +41,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "LeClientReadCharacteristic"}, FunctionInfo{1, nullptr, "LeClientReadDescriptor"}, FunctionInfo{2, nullptr, "LeClientWriteCharacteristic"}, @@ -71,7 +71,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "InitializeBluetoothDriver"}, FunctionInfo{1, nullptr, "InitializeBluetooth"}, FunctionInfo{2, nullptr, "EnableBluetooth"}, diff --git a/src/core/hle/service/btm/btm.cpp b/src/core/hle/service/btm/btm.cpp index 3c0bdbcca1..0bc6d8a3fa 100644 --- a/src/core/hle/service/btm/btm.cpp +++ b/src/core/hle/service/btm/btm.cpp @@ -121,7 +121,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IBtmSystemCore::StartGamepadPairing>, "StartGamepadPairing"}, FunctionInfo{1, C<&IBtmSystemCore::CancelGamepadPairing>, "CancelGamepadPairing"}, FunctionInfo{2, nullptr, "ClearGamepadPairingDatabase"}, @@ -168,7 +168,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IBtmSystem::GetCore>, "GetCore"} ); }; @@ -229,7 +229,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IBtmUserCore::AcquireBleScanEvent>, "AcquireBleScanEvent"}, FunctionInfo{1, nullptr, "GetBleScanFilterParameter"}, FunctionInfo{2, nullptr, "GetBleScanFilterParameter2"}, @@ -285,7 +285,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IBtmUser::GetCore>, "GetCore"} ); }; @@ -297,7 +297,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "AcquireDiscoveryEvent"}, FunctionInfo{1, nullptr, "StartDiscovery"}, FunctionInfo{2, nullptr, "CancelDiscovery"}, @@ -323,7 +323,7 @@ class IBtm final : public ServiceFramework { public: explicit IBtm(Core::System& system_) : ServiceFramework{system_, "btm"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetState"}, FunctionInfo{1, nullptr, "GetHostDeviceProperty"}, FunctionInfo{2, nullptr, "AcquireDeviceConditionEvent"}, diff --git a/src/core/hle/service/caps/caps.cpp b/src/core/hle/service/caps/caps.cpp index 716334e0a5..cf325ab9f0 100644 --- a/src/core/hle/service/caps/caps.cpp +++ b/src/core/hle/service/caps/caps.cpp @@ -22,7 +22,7 @@ class IDecoderControlService final : public ServiceFramework, "GetAlbumFileList"}, FunctionInfo{2, nullptr, "LoadAlbumFile"}, diff --git a/src/core/hle/service/caps/caps_c.cpp b/src/core/hle/service/caps/caps_c.cpp index a327072425..f3ef1dff0b 100644 --- a/src/core/hle/service/caps/caps_c.cpp +++ b/src/core/hle/service/caps/caps_c.cpp @@ -15,7 +15,7 @@ namespace Service::Capture { ServiceFrameworkBase::FunctionInfoBase const* IAlbumControlService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "CaptureRawImage"}, FunctionInfo{2, nullptr, "CaptureRawImageWithTimeout"}, FunctionInfo{33, C<&IAlbumControlService::SetShimLibraryVersion>, "SetShimLibraryVersion"}, diff --git a/src/core/hle/service/caps/caps_sc.h b/src/core/hle/service/caps/caps_sc.h index 0b95aed2f1..286de93ee1 100644 --- a/src/core/hle/service/caps/caps_sc.h +++ b/src/core/hle/service/caps/caps_sc.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "CaptureRawImage"}, FunctionInfo{2, nullptr, "CaptureRawImageWithTimeout"}, FunctionInfo{3, nullptr, "AttachSharedBuffer"}, diff --git a/src/core/hle/service/caps/caps_ss.cpp b/src/core/hle/service/caps/caps_ss.cpp index 9116016d65..a422df2022 100644 --- a/src/core/hle/service/caps/caps_ss.cpp +++ b/src/core/hle/service/caps/caps_ss.cpp @@ -13,7 +13,7 @@ namespace Service::Capture { ServiceFrameworkBase::FunctionInfoBase const* IScreenShotService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{201, nullptr, "SaveScreenShot"}, FunctionInfo{202, nullptr, "SaveEditedScreenShot"}, FunctionInfo{203, C<&IScreenShotService::SaveScreenShotEx0>, "SaveScreenShotEx0"}, diff --git a/src/core/hle/service/caps/caps_su.cpp b/src/core/hle/service/caps/caps_su.cpp index 00e27d30d9..6ad54b341f 100644 --- a/src/core/hle/service/caps/caps_su.cpp +++ b/src/core/hle/service/caps/caps_su.cpp @@ -16,7 +16,7 @@ namespace Service::Capture { ServiceFrameworkBase::FunctionInfoBase const* IScreenShotApplicationService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{32, C<&IScreenShotApplicationService::SetShimLibraryVersion>, "SetShimLibraryVersion"}, FunctionInfo{201, nullptr, "SaveScreenShot"}, FunctionInfo{203, C<&IScreenShotApplicationService::SaveScreenShotEx0>, "SaveScreenShotEx0"}, diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp index 25b4c2078c..5ed39fc3e9 100644 --- a/src/core/hle/service/caps/caps_u.cpp +++ b/src/core/hle/service/caps/caps_u.cpp @@ -14,7 +14,7 @@ namespace Service::Capture { ServiceFrameworkBase::FunctionInfoBase const* IAlbumApplicationService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{32, C<&IAlbumApplicationService::SetShimLibraryVersion>, "SetShimLibraryVersion"}, FunctionInfo{102, C<&IAlbumApplicationService::GetAlbumFileList0AafeAruidDeprecated>, "GetAlbumFileList0AafeAruidDeprecated"}, FunctionInfo{103, nullptr, "DeleteAlbumFileByAruid"}, diff --git a/src/core/hle/service/erpt/erpt.cpp b/src/core/hle/service/erpt/erpt.cpp index 043f54e3a0..8da01b03aa 100644 --- a/src/core/hle/service/erpt/erpt.cpp +++ b/src/core/hle/service/erpt/erpt.cpp @@ -66,7 +66,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ErrorReportContext::SubmitContext>, "SubmitContext"}, FunctionInfo{1, C<&ErrorReportContext::CreateReportV0>, "CreateReportV0"}, FunctionInfo{2, nullptr, "SetInitialLaunchSettingsCompletionTime"}, @@ -95,7 +95,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenReport"}, FunctionInfo{1, nullptr, "OpenManager"}, FunctionInfo{2, nullptr, "OpenAttachment"} diff --git a/src/core/hle/service/es/es.cpp b/src/core/hle/service/es/es.cpp index f4088e5c79..a8df226143 100644 --- a/src/core/hle/service/es/es.cpp +++ b/src/core/hle/service/es/es.cpp @@ -221,7 +221,7 @@ private: rb.Push(write_size); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, &ETicket::ImportTicket, "ImportTicket"}, FunctionInfo{2, nullptr, "ImportTicketCertificateSet"}, FunctionInfo{3, nullptr, "DeleteTicket"}, @@ -325,7 +325,7 @@ public: explicit NDRM_LU(Core::System& system_) : ServiceFramework{system_, "ndrm:lu"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "Cmd1"}, FunctionInfo{2, nullptr, "Cmd2"}, FunctionInfo{3, nullptr, "Cmd3"}, @@ -342,7 +342,7 @@ public: explicit NDRM_LA(Core::System& system_) : ServiceFramework{system_, "ndrm:la"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "Cmd1"}, FunctionInfo{2, nullptr, "Cmd2"}, FunctionInfo{3, nullptr, "Cmd3"}, diff --git a/src/core/hle/service/eupld/eupld.cpp b/src/core/hle/service/eupld/eupld.cpp index 86cb3e9fc7..46f771bb72 100644 --- a/src/core/hle/service/eupld/eupld.cpp +++ b/src/core/hle/service/eupld/eupld.cpp @@ -16,7 +16,7 @@ class ErrorUploadContext final : public ServiceFramework { public: explicit ErrorUploadContext(Core::System& system_) : ServiceFramework{system_, "eupld:c"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetUrl"}, FunctionInfo{1, nullptr, "ImportCrt"}, FunctionInfo{2, nullptr, "ImportPki"}, @@ -32,7 +32,7 @@ class ErrorUploadRequest final : public ServiceFramework { public: explicit ErrorUploadRequest(Core::System& system_) : ServiceFramework{system_, "eupld:r"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "UploadAll"}, FunctionInfo{2, nullptr, "UploadSelected"}, diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index 7d9739b456..fd5da76a16 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -173,7 +173,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetFatalEvent"}, FunctionInfo{10, nullptr, "GetFatalContext"} ); @@ -187,7 +187,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &Fatal_U::ThrowFatal, "ThrowFatal"}, FunctionInfo{1, &Fatal_U::ThrowFatalWithPolicy, "ThrowFatalWithPolicy"}, FunctionInfo{2, &Fatal_U::ThrowFatalWithCpuContext, "ThrowFatalWithCpuContext"} diff --git a/src/core/hle/service/fgm/fgm.cpp b/src/core/hle/service/fgm/fgm.cpp index 7cef3c3a8e..96bfd07bbe 100644 --- a/src/core/hle/service/fgm/fgm.cpp +++ b/src/core/hle/service/fgm/fgm.cpp @@ -22,7 +22,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "Set"}, FunctionInfo{2, nullptr, "Get"}, @@ -47,7 +47,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &FGM::Initialize, "Initialize"} ); }; @@ -60,7 +60,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "Read"}, FunctionInfo{2, nullptr, "Cancel"} diff --git a/src/core/hle/service/filesystem/fsp/fs_i_directory.cpp b/src/core/hle/service/filesystem/fsp/fs_i_directory.cpp index 86cc0fbe98..e402b151e6 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_directory.cpp +++ b/src/core/hle/service/filesystem/fsp/fs_i_directory.cpp @@ -12,7 +12,7 @@ namespace Service::FileSystem { ServiceFrameworkBase::FunctionInfoBase const* IDirectory::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDirectory::Read>, "Read"}, FunctionInfo{1, D<&IDirectory::GetEntryCount>, "GetEntryCount"} ); diff --git a/src/core/hle/service/filesystem/fsp/fs_i_file.h b/src/core/hle/service/filesystem/fsp/fs_i_file.h index a5758c1844..ca5606a61a 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_file.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_file.h @@ -34,7 +34,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IFile::Read>, "Read"}, FunctionInfo{1, D<&IFile::Write>, "Write"}, FunctionInfo{2, D<&IFile::Flush>, "Flush"}, diff --git a/src/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp b/src/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp index a50a01fa19..f7a4bce8d9 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp +++ b/src/core/hle/service/filesystem/fsp/fs_i_filesystem.cpp @@ -14,7 +14,7 @@ namespace Service::FileSystem { ServiceFrameworkBase::FunctionInfoBase const* IFileSystem::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IFileSystem::CreateFile>, "CreateFile"}, FunctionInfo{1, D<&IFileSystem::DeleteFile>, "DeleteFile"}, FunctionInfo{2, D<&IFileSystem::CreateDirectory>, "CreateDirectory"}, diff --git a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h index f20693f334..81502450b4 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_multi_commit_manager.h @@ -23,7 +23,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, D<&IMultiCommitManager::Add>, "Add"}, FunctionInfo{2, D<&IMultiCommitManager::Commit>, "Commit"} ); diff --git a/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h b/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h index e04434b6e4..489dacce04 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h @@ -48,7 +48,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISaveDataInfoReader::ReadSaveDataInfo>, "ReadSaveDataInfo"} ); std::shared_ptr save_data_controller; diff --git a/src/core/hle/service/filesystem/fsp/fs_i_storage.h b/src/core/hle/service/filesystem/fsp/fs_i_storage.h index f7f65d2cd4..5984e7deb4 100644 --- a/src/core/hle/service/filesystem/fsp/fs_i_storage.h +++ b/src/core/hle/service/filesystem/fsp/fs_i_storage.h @@ -26,7 +26,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IStorage::Read>, "Read"}, FunctionInfo{1, nullptr, "Write"}, FunctionInfo{2, nullptr, "Flush"}, diff --git a/src/core/hle/service/filesystem/fsp/fsp_ldr.h b/src/core/hle/service/filesystem/fsp/fsp_ldr.h index 08bc89df2d..84d1f83fc0 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_ldr.h +++ b/src/core/hle/service/filesystem/fsp/fsp_ldr.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenCodeFileSystem"}, FunctionInfo{1, nullptr, "IsArchivedProgram"}, FunctionInfo{2, nullptr, "SetCurrentProcess"} diff --git a/src/core/hle/service/filesystem/fsp/fsp_pr.h b/src/core/hle/service/filesystem/fsp/fsp_pr.h index cd13babf15..d6419187d6 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_pr.h +++ b/src/core/hle/service/filesystem/fsp/fsp_pr.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RegisterProgram"}, FunctionInfo{1, nullptr, "UnregisterProgram"}, FunctionInfo{2, nullptr, "SetCurrentProcess"}, diff --git a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp index 76c5648ae2..13f3ff7475 100644 --- a/src/core/hle/service/filesystem/fsp/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp/fsp_srv.cpp @@ -48,7 +48,7 @@ namespace Service::FileSystem { ServiceFrameworkBase::FunctionInfoBase const* FSP_SRV::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenFileSystem"}, FunctionInfo{1, D<&FSP_SRV::SetCurrentProcess>, "SetCurrentProcess"}, FunctionInfo{2, D<&FSP_SRV::OpenDataFileSystemByCurrentProcess>, "OpenDataFileSystemByCurrentProcess"}, diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 2f6d96dbba..e50a0d3b6b 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -252,7 +252,7 @@ private: rb.Push(0); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IFriendService::GetCompletionEvent, "GetCompletionEvent"}, FunctionInfo{1, &IFriendService::Cancel, "Cancel"}, FunctionInfo{10100, nullptr, "GetFriendListIds"}, @@ -457,7 +457,7 @@ private: bool has_received_friend_request; }; - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &INotificationService::GetEvent, "GetEvent"}, FunctionInfo{1, &INotificationService::Clear, "Clear"}, FunctionInfo{2, &INotificationService::Pop, "Pop"} @@ -503,7 +503,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetReceivableNeighborInfoCountMax"}, FunctionInfo{10, nullptr, "IsNeighborDetectionEnabled"} ); @@ -519,7 +519,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetReceivableNeighborInfoCountMax"}, FunctionInfo{10, nullptr, "IsNeighborDetectionEnabled"}, FunctionInfo{200, nullptr, "SetSystemData"}, diff --git a/src/core/hle/service/friend/friend_interface.h b/src/core/hle/service/friend/friend_interface.h index 0bb02c14cd..56b2877e70 100644 --- a/src/core/hle/service/friend/friend_interface.h +++ b/src/core/hle/service/friend/friend_interface.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &Friend::CreateFriendService, "CreateFriendService"}, FunctionInfo{1, &Friend::CreateNotificationService, "CreateNotificationService"}, FunctionInfo{2, nullptr, "CreateDaemonSuspendSessionService"} diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp index 1eb5e30448..858d3f3ed0 100644 --- a/src/core/hle/service/glue/arp.cpp +++ b/src/core/hle/service/glue/arp.cpp @@ -216,7 +216,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IRegistrar::Issue, "Issue"}, FunctionInfo{1, &IRegistrar::SetApplicationLaunchProperty, "SetApplicationLaunchProperty"}, FunctionInfo{2, &IRegistrar::SetApplicationControlProperty, "SetApplicationControlProperty"} diff --git a/src/core/hle/service/glue/arp.h b/src/core/hle/service/glue/arp.h index fee145a3d3..7c7a72058c 100644 --- a/src/core/hle/service/glue/arp.h +++ b/src/core/hle/service/glue/arp.h @@ -27,7 +27,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ARP_R::GetApplicationLaunchProperty, "GetApplicationLaunchProperty"}, FunctionInfo{1, &ARP_R::GetApplicationLaunchPropertyWithApplicationId, "GetApplicationLaunchPropertyWithApplicationId"}, FunctionInfo{2, &ARP_R::GetApplicationControlProperty, "GetApplicationControlProperty"}, @@ -54,7 +54,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ARP_W::AcquireRegistrar, "AcquireRegistrar"}, FunctionInfo{1, &ARP_W::UnregisterApplicationInstance , "UnregisterApplicationInstance "}, FunctionInfo{2, nullptr, "AcquireUpdater"} diff --git a/src/core/hle/service/glue/bgtc.h b/src/core/hle/service/glue/bgtc.h index 2e5ed710b9..f03b97f3dc 100644 --- a/src/core/hle/service/glue/bgtc.h +++ b/src/core/hle/service/glue/bgtc.h @@ -23,7 +23,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{100, &BGTC_T::OpenTaskService, "OpenTaskService"} ); }; @@ -36,7 +36,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "NotifyTaskStarting"}, FunctionInfo{2, nullptr, "NotifyTaskFinished"}, FunctionInfo{3, nullptr, "GetTriggerEvent"}, @@ -64,7 +64,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "GetState"}, FunctionInfo{2, nullptr, "GetStateChangedEvent"}, FunctionInfo{3, nullptr, "NotifyEnteringHalfAwake"}, diff --git a/src/core/hle/service/glue/ectx.cpp b/src/core/hle/service/glue/ectx.cpp index d9315fb575..33af739b05 100644 --- a/src/core/hle/service/glue/ectx.cpp +++ b/src/core/hle/service/glue/ectx.cpp @@ -38,7 +38,7 @@ private: rb.Push(0); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IContextRegistrar::Complete, "Complete"} ); }; diff --git a/src/core/hle/service/glue/ectx.h b/src/core/hle/service/glue/ectx.h index 4971b6595b..fbe0e266ec 100644 --- a/src/core/hle/service/glue/ectx.h +++ b/src/core/hle/service/glue/ectx.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateContextRegistrar"}, FunctionInfo{1, nullptr, "CommitContext"}, FunctionInfo{2, nullptr, "RemoveContext"} @@ -37,7 +37,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetContextInfo"}, FunctionInfo{1, nullptr, "PullContext"}, FunctionInfo{2, nullptr, "ListContextDescriptorWithResultForDebug"} @@ -55,7 +55,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ECTX_AW::CreateContextRegistrar, "CreateContextRegistrar"}, FunctionInfo{1, nullptr, "CommitContext"} ); diff --git a/src/core/hle/service/glue/notif.cpp b/src/core/hle/service/glue/notif.cpp index 032967c07f..f582b7b8cc 100644 --- a/src/core/hle/service/glue/notif.cpp +++ b/src/core/hle/service/glue/notif.cpp @@ -21,7 +21,7 @@ constexpr inline std::size_t MaxAlarms = 8; } ServiceFrameworkBase::FunctionInfoBase const* INotificationServicesForApplication::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{500, D<&INotificationServicesForApplication::RegisterAlarmSetting>, "RegisterAlarmSetting"}, FunctionInfo{510, D<&INotificationServicesForApplication::UpdateAlarmSetting>, "UpdateAlarmSetting"}, FunctionInfo{520, D<&INotificationServicesForApplication::ListAlarmSettings>, "ListAlarmSettings"}, @@ -33,7 +33,7 @@ ServiceFrameworkBase::FunctionInfoBase const* INotificationServicesForApplicatio } ServiceFrameworkBase::FunctionInfoBase const* INotificationServices::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{500, D<&INotificationServices::RegisterAlarmSetting>, "RegisterAlarmSetting"}, FunctionInfo{510, D<&INotificationServices::UpdateAlarmSetting>, "UpdateAlarmSetting"}, FunctionInfo{520, D<&INotificationServices::ListAlarmSettings>, "ListAlarmSettings"}, @@ -223,7 +223,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&INotificationSystemEventAccessor::GetSystemEvent>, "GetSystemEvent"} ); KernelHelpers::ServiceContext service_context; diff --git a/src/core/hle/service/glue/time/static.cpp b/src/core/hle/service/glue/time/static.cpp index fbb4f3b919..a8bd1f271c 100644 --- a/src/core/hle/service/glue/time/static.cpp +++ b/src/core/hle/service/glue/time/static.cpp @@ -25,7 +25,7 @@ namespace Service::Glue::Time { ServiceFrameworkBase::FunctionInfoBase const* StaticService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&StaticService::GetStandardUserSystemClock>, "GetStandardUserSystemClock"}, FunctionInfo{1, D<&StaticService::GetStandardNetworkSystemClock>, "GetStandardNetworkSystemClock"}, FunctionInfo{2, D<&StaticService::GetStandardSteadyClock>, "GetStandardSteadyClock"}, diff --git a/src/core/hle/service/glue/time/time_zone.cpp b/src/core/hle/service/glue/time/time_zone.cpp index 8b222003ac..403c9f51d9 100644 --- a/src/core/hle/service/glue/time/time_zone.cpp +++ b/src/core/hle/service/glue/time/time_zone.cpp @@ -20,7 +20,7 @@ namespace Service::Glue::Time { ServiceFrameworkBase::FunctionInfoBase const* TimeZoneService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&TimeZoneService::GetDeviceLocationName>, "GetDeviceLocationName"}, FunctionInfo{1, D<&TimeZoneService::SetDeviceLocationName>, "SetDeviceLocationName"}, FunctionInfo{2, D<&TimeZoneService::GetTotalLocationNameCount>, "GetTotalLocationNameCount"}, diff --git a/src/core/hle/service/gpio/gpio.cpp b/src/core/hle/service/gpio/gpio.cpp index 26de48ffe2..976630b274 100644 --- a/src/core/hle/service/gpio/gpio.cpp +++ b/src/core/hle/service/gpio/gpio.cpp @@ -19,7 +19,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Cmd0"} ); }; diff --git a/src/core/hle/service/grc/grc.cpp b/src/core/hle/service/grc/grc.cpp index ffdbef343c..0624ccddab 100644 --- a/src/core/hle/service/grc/grc.cpp +++ b/src/core/hle/service/grc/grc.cpp @@ -16,7 +16,7 @@ class GRC final : public ServiceFramework { public: explicit GRC(Core::System& system_) : ServiceFramework{system_, "grc:c"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "OpenContinuousRecorder"}, FunctionInfo{2, nullptr, "OpenGameMovieTrimmer"}, FunctionInfo{3, nullptr, "OpenOffscreenRecorder"}, @@ -32,7 +32,7 @@ class GRC_D final : public ServiceFramework { public: explicit GRC_D(Core::System& system_) : ServiceFramework{system_, "grc:d"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "Initialize"}, FunctionInfo{2, nullptr, "Transfer"}, FunctionInfo{3, nullptr, "Cmd3"} diff --git a/src/core/hle/service/hid/active_vibration_device_list.cpp b/src/core/hle/service/hid/active_vibration_device_list.cpp index 068c6521e5..9a4c8aef14 100644 --- a/src/core/hle/service/hid/active_vibration_device_list.cpp +++ b/src/core/hle/service/hid/active_vibration_device_list.cpp @@ -15,7 +15,7 @@ namespace Service::HID { ServiceFrameworkBase::FunctionInfoBase const* IActiveVibrationDeviceList::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IActiveVibrationDeviceList::ActivateVibrationDevice>, "ActivateVibrationDevice"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/hid/applet_resource.cpp b/src/core/hle/service/hid/applet_resource.cpp index c0ccaf822c..0192ea9085 100644 --- a/src/core/hle/service/hid/applet_resource.cpp +++ b/src/core/hle/service/hid/applet_resource.cpp @@ -13,7 +13,7 @@ namespace Service::HID { ServiceFrameworkBase::FunctionInfoBase const* IAppletResource::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IAppletResource::GetSharedMemoryHandle>, "GetSharedMemoryHandle"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 679aa71989..4f2d7d7aaa 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -29,7 +29,7 @@ public: explicit IHidTemporaryServer(Core::System& system_) : ServiceFramework{system_, "hid:tmp"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetConsoleSixAxisSensorCalibrationValues"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -43,7 +43,7 @@ public: explicit AHID_CD(Core::System& system_) : ServiceFramework{system_, "ahid:cd"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "AcquireDevice"}, FunctionInfo{1, nullptr, "ReleaseDevice"}, FunctionInfo{2, nullptr, "GetCtrlSession"}, @@ -61,7 +61,7 @@ public: explicit AHID_HDR(Core::System& system_) : ServiceFramework{system_, "ahid:hdr"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetDeviceEntries"}, FunctionInfo{1, nullptr, "GetDeviceList"}, FunctionInfo{2, nullptr, "GetDeviceParameters"}, @@ -211,7 +211,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "DeactivateDebugPad"}, FunctionInfo{1, nullptr, "SetDebugPadAutoPilotState"}, FunctionInfo{2, nullptr, "UnsetDebugPadAutoPilotState"}, diff --git a/src/core/hle/service/hid/hid_server.cpp b/src/core/hle/service/hid/hid_server.cpp index d17c52dfe0..04294cf15a 100644 --- a/src/core/hle/service/hid/hid_server.cpp +++ b/src/core/hle/service/hid/hid_server.cpp @@ -43,7 +43,7 @@ namespace Service::HID { ServiceFrameworkBase::FunctionInfoBase const* IHidServer::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IHidServer::CreateAppletResource>, "CreateAppletResource"}, FunctionInfo{1, C<&IHidServer::ActivateDebugPad>, "ActivateDebugPad"}, FunctionInfo{11, C<&IHidServer::ActivateTouchScreen>, "ActivateTouchScreen"}, diff --git a/src/core/hle/service/hid/hid_system_server.h b/src/core/hle/service/hid/hid_system_server.h index f6ce0f3793..0db29a2953 100644 --- a/src/core/hle/service/hid/hid_system_server.h +++ b/src/core/hle/service/hid/hid_system_server.h @@ -87,7 +87,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{31, nullptr, "SendKeyboardLockKeyEvent"}, FunctionInfo{101, nullptr, "AcquireHomeButtonEventHandle"}, FunctionInfo{111, nullptr, "ActivateHomeButton"}, diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index 2733df7393..8042e7949d 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -27,7 +27,7 @@ namespace Service::HID { constexpr auto hidbus_update_ns = std::chrono::nanoseconds{15 * 1000 * 1000}; ServiceFrameworkBase::FunctionInfoBase const* Hidbus::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, C<&Hidbus::GetBusHandle>, "GetBusHandle"}, FunctionInfo{2, C<&Hidbus::IsExternalDeviceConnected>, "IsExternalDeviceConnected"}, FunctionInfo{3, C<&Hidbus::Initialize>, "Initialize"}, diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp index e0caa082fa..42fc07c066 100644 --- a/src/core/hle/service/hid/irs.cpp +++ b/src/core/hle/service/hid/irs.cpp @@ -30,7 +30,7 @@ namespace Service::IRS { ServiceFrameworkBase::FunctionInfoBase const* IRS::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{302, C<&IRS::ActivateIrsensor>, "ActivateIrsensor"}, FunctionInfo{303, C<&IRS::DeactivateIrsensor>, "DeactivateIrsensor"}, FunctionInfo{304, C<&IRS::GetIrsensorSharedMemoryHandle>, "GetIrsensorSharedMemoryHandle"}, diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h index 96a275edb4..73169924ad 100644 --- a/src/core/hle/service/hid/irs.h +++ b/src/core/hle/service/hid/irs.h @@ -172,7 +172,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{500, nullptr, "SetAppletResourceUserId"}, FunctionInfo{501, nullptr, "RegisterAppletResourceUserId"}, FunctionInfo{502, nullptr, "UnregisterAppletResourceUserId"}, diff --git a/src/core/hle/service/hid/xcd.h b/src/core/hle/service/hid/xcd.h index 669c2cffa1..33dc6e32d1 100644 --- a/src/core/hle/service/hid/xcd.h +++ b/src/core/hle/service/hid/xcd.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetDataFormat"}, FunctionInfo{1, nullptr, "SetDataFormat"}, FunctionInfo{2, nullptr, "GetMcuState"}, diff --git a/src/core/hle/service/i2c/i2c.cpp b/src/core/hle/service/i2c/i2c.cpp index 0c3de53d8d..3ee8023ef4 100644 --- a/src/core/hle/service/i2c/i2c.cpp +++ b/src/core/hle/service/i2c/i2c.cpp @@ -28,7 +28,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SendOld"}, FunctionInfo{1, nullptr, "ReceiveOld"}, FunctionInfo{2, nullptr, "ExecuteCommandListOld"}, @@ -78,7 +78,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&I2C::OpenSessionForDev>, "OpenSessionForDev"}, FunctionInfo{1, C<&I2C::OpenSession>, "OpenSession"}, FunctionInfo{2, C<&I2C::HasDevice>, "HasDevice"}, diff --git a/src/core/hle/service/jit/jit.cpp b/src/core/hle/service/jit/jit.cpp index 25ed4e9775..f201e82d1e 100644 --- a/src/core/hle/service/jit/jit.cpp +++ b/src/core/hle/service/jit/jit.cpp @@ -240,7 +240,7 @@ private: return in; } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IJitEnvironment::GenerateCode>, "GenerateCode"}, FunctionInfo{1, C<&IJitEnvironment::Control>, "Control"}, FunctionInfo{1000, C<&IJitEnvironment::LoadPlugin>, "LoadPlugin"}, @@ -289,7 +289,7 @@ private: } private: - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&JITU::CreateJitEnvironment>, "CreateJitEnvironment"} ); diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp index 1bb5d1e558..560360a495 100644 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/core/hle/service/lbl/lbl.cpp @@ -302,7 +302,7 @@ private: rb.Push(auto_brightness_supported); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &LBL::SaveCurrentSetting, "SaveCurrentSetting"}, FunctionInfo{1, &LBL::LoadCurrentSetting, "LoadCurrentSetting"}, FunctionInfo{2, &LBL::SetCurrentBrightnessSetting, "SetCurrentBrightnessSetting"}, diff --git a/src/core/hle/service/ldn/ldn.cpp b/src/core/hle/service/ldn/ldn.cpp index 2d25749809..2b3c85ec56 100644 --- a/src/core/hle/service/ldn/ldn.cpp +++ b/src/core/hle/service/ldn/ldn.cpp @@ -31,7 +31,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IClientProcessMonitor::RegisterClient>, "RegisterClient"} ); }; @@ -51,7 +51,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IMonitorServiceCreator::CreateMonitorService>, "CreateMonitorService"} ); }; @@ -80,7 +80,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISystemServiceCreator::CreateSystemLocalCommunicationService>, "CreateSystemLocalCommunicationService"}, FunctionInfo{1, C<&ISystemServiceCreator::CreateClientProcessMonitor>, "CreateClientProcessMonitor"} // 18.0.0+ ); @@ -110,7 +110,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IUserServiceCreator::CreateUserLocalCommunicationService>, "CreateUserLocalCommunicationService"}, FunctionInfo{1, D<&IUserServiceCreator::CreateClientProcessMonitor>, "CreateClientProcessMonitor"} // 18.0.0+ ); @@ -141,7 +141,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISfServiceCreator::CreateNetworkService>, "CreateNetworkService"}, FunctionInfo{8, C<&ISfServiceCreator::CreateNetworkServiceMonitor>, "CreateNetworkServiceMonitor"} ); @@ -163,7 +163,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISfMonitorServiceCreator::CreateMonitorService>, "CreateMonitorService"} ); }; diff --git a/src/core/hle/service/ldn/monitor_service.cpp b/src/core/hle/service/ldn/monitor_service.cpp index 99f24df45c..20fc08d730 100644 --- a/src/core/hle/service/ldn/monitor_service.cpp +++ b/src/core/hle/service/ldn/monitor_service.cpp @@ -11,7 +11,7 @@ namespace Service::LDN { ServiceFrameworkBase::FunctionInfoBase const* IMonitorService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IMonitorService::GetStateForMonitor>, "GetStateForMonitor"}, FunctionInfo{1, nullptr, "GetNetworkInfoForMonitor"}, FunctionInfo{2, nullptr, "GetIpv4AddressForMonitor"}, diff --git a/src/core/hle/service/ldn/sf_monitor_service.cpp b/src/core/hle/service/ldn/sf_monitor_service.cpp index f00ae8a0d1..d31bc7fd9c 100644 --- a/src/core/hle/service/ldn/sf_monitor_service.cpp +++ b/src/core/hle/service/ldn/sf_monitor_service.cpp @@ -11,7 +11,7 @@ namespace Service::LDN { ServiceFrameworkBase::FunctionInfoBase const* ISfMonitorService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISfMonitorService::Initialize>, "Initialize"}, FunctionInfo{288, C<&ISfMonitorService::GetGroupInfo>, "GetGroupInfo"}, FunctionInfo{320, nullptr, "GetLinkLevel"} diff --git a/src/core/hle/service/ldn/sf_service.h b/src/core/hle/service/ldn/sf_service.h index 4ced923d60..696b39bd2d 100644 --- a/src/core/hle/service/ldn/sf_service.h +++ b/src/core/hle/service/ldn/sf_service.h @@ -23,7 +23,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{256, nullptr, "AttachNetworkInterfaceStateChangeEvent"}, FunctionInfo{264, nullptr, "GetNetworkInterfaceLastError"}, diff --git a/src/core/hle/service/ldn/sf_service_monitor.cpp b/src/core/hle/service/ldn/sf_service_monitor.cpp index e64ebecbb2..e28bf22aad 100644 --- a/src/core/hle/service/ldn/sf_service_monitor.cpp +++ b/src/core/hle/service/ldn/sf_service_monitor.cpp @@ -11,7 +11,7 @@ namespace Service::LDN { ServiceFrameworkBase::FunctionInfoBase const* ISfServiceMonitor::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISfServiceMonitor::Initialize>, "Initialize"}, FunctionInfo{256, nullptr, "AttachNetworkInterfaceStateChangeEvent"}, FunctionInfo{264, nullptr, "GetNetworkInterfaceLastError"}, diff --git a/src/core/hle/service/ldn/system_local_communication_service.cpp b/src/core/hle/service/ldn/system_local_communication_service.cpp index a421fbc41a..7f262afd13 100644 --- a/src/core/hle/service/ldn/system_local_communication_service.cpp +++ b/src/core/hle/service/ldn/system_local_communication_service.cpp @@ -10,7 +10,7 @@ namespace Service::LDN { ServiceFrameworkBase::FunctionInfoBase const* ISystemLocalCommunicationService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetState"}, FunctionInfo{1, nullptr, "GetNetworkInfo"}, FunctionInfo{2, nullptr, "GetIpv4Address"}, diff --git a/src/core/hle/service/ldn/user_local_communication_service.cpp b/src/core/hle/service/ldn/user_local_communication_service.cpp index 19d20a9701..1596d58a6b 100644 --- a/src/core/hle/service/ldn/user_local_communication_service.cpp +++ b/src/core/hle/service/ldn/user_local_communication_service.cpp @@ -22,7 +22,7 @@ namespace Service::LDN { ServiceFrameworkBase::FunctionInfoBase const* IUserLocalCommunicationService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IUserLocalCommunicationService::GetState>, "GetState"}, FunctionInfo{1, D<&IUserLocalCommunicationService::GetNetworkInfo>, "GetNetworkInfo"}, FunctionInfo{2, D<&IUserLocalCommunicationService::GetIpv4Address>, "GetIpv4Address"}, diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 31865f12fb..900df0c00e 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -14,7 +14,7 @@ class DebugMonitor final : public ServiceFramework { public: explicit DebugMonitor(Core::System& system_) : ServiceFramework{system_, "ldr:dmnt"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetProgramArgument"}, FunctionInfo{1, nullptr, "FlushArguments"}, FunctionInfo{2, nullptr, "GetProcessModuleInfo"} @@ -28,7 +28,7 @@ class ProcessManager final : public ServiceFramework { public: explicit ProcessManager(Core::System& system_) : ServiceFramework{system_, "ldr:pm"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateProcess"}, FunctionInfo{1, nullptr, "GetProgramInfo"}, FunctionInfo{2, nullptr, "PinProgram"}, @@ -44,7 +44,7 @@ class Shell final : public ServiceFramework { public: explicit Shell(Core::System& system_) : ServiceFramework{system_, "ldr:shel"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetProgramArgument"}, FunctionInfo{1, nullptr, "FlushArguments"} ); diff --git a/src/core/hle/service/lm/lm.cpp b/src/core/hle/service/lm/lm.cpp index 145723a61a..49bfe819f2 100644 --- a/src/core/hle/service/lm/lm.cpp +++ b/src/core/hle/service/lm/lm.cpp @@ -325,7 +325,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ILogger::Log, "Log"}, FunctionInfo{1, &ILogger::SetDestination, "SetDestination"}, FunctionInfo{2, nullptr, "TransmitHashedLog"}, //20.0.0+ @@ -352,7 +352,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &LM::OpenLogger, "OpenLogger"} ); }; @@ -365,7 +365,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "StartLogging"}, FunctionInfo{1, nullptr, "StopLogging"}, FunctionInfo{2, nullptr, "GetLog"}, diff --git a/src/core/hle/service/mig/mig.cpp b/src/core/hle/service/mig/mig.cpp index 822e45d1cc..a17a404311 100644 --- a/src/core/hle/service/mig/mig.cpp +++ b/src/core/hle/service/mig/mig.cpp @@ -20,7 +20,7 @@ public: return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Unknown0"}, //19.0.0+ FunctionInfo{1, nullptr, "Unknown1"}, //20.0.0+ FunctionInfo{2, nullptr, "Unknown2"}, //20.0.0+ diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp index 95a5bec4b3..8977dccabe 100644 --- a/src/core/hle/service/mii/mii.cpp +++ b/src/core/hle/service/mii/mii.cpp @@ -23,7 +23,7 @@ namespace Service::Mii { ServiceFrameworkBase::FunctionInfoBase const* IStaticService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IStaticService::GetDatabaseService>, "GetDatabaseService"} ); return HandlerTableGenerateWithFind(key, functions); @@ -264,7 +264,7 @@ private: R_RETURN(manager->Append(metadata, char_info)); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDatabaseService::IsUpdated>, "IsUpdated"}, FunctionInfo{1, D<&IDatabaseService::IsFullDatabase>, "IsFullDatabase"}, FunctionInfo{2, D<&IDatabaseService::GetCount>, "GetCount"}, @@ -343,7 +343,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IImageDatabaseService::Initialize>, "Initialize"}, FunctionInfo{10, nullptr, "Reload"}, FunctionInfo{11, D<&IImageDatabaseService::GetCount>, "GetCount"}, diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index dfc4da2472..a28a6450fb 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -201,7 +201,7 @@ private: rb.Push(0); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &MM_U::InitializeOld, "InitializeOld"}, FunctionInfo{1, &MM_U::FinalizeOld, "FinalizeOld"}, FunctionInfo{2, &MM_U::SetAndWaitOld, "SetAndWaitOld"}, diff --git a/src/core/hle/service/mnpp/mnpp.cpp b/src/core/hle/service/mnpp/mnpp.cpp index dae45bd3a5..86389ca829 100644 --- a/src/core/hle/service/mnpp/mnpp.cpp +++ b/src/core/hle/service/mnpp/mnpp.cpp @@ -35,7 +35,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &MNPP_APP::Cmd0, "Cmd0"}, FunctionInfo{1, &MNPP_APP::Cmd1, "Cmd1"} ); @@ -45,7 +45,7 @@ class MNPP_SYS final : public ServiceFramework { public: explicit MNPP_SYS(Core::System& system_) : ServiceFramework{system_, "mnpp:sys"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Cmd0"}, FunctionInfo{10, nullptr, "Cmd10"}, FunctionInfo{100, nullptr, "Cmd100"}, @@ -62,7 +62,7 @@ class MNPP_WEB final : public ServiceFramework { public: explicit MNPP_WEB(Core::System& system_) : ServiceFramework{system_, "mnpp:web"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Cmd0"}, FunctionInfo{1, nullptr, "Cmd1"}, FunctionInfo{10, nullptr, "Cmd10"}, diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp index 9049b5c168..5748ab5a5d 100644 --- a/src/core/hle/service/ncm/ncm.cpp +++ b/src/core/hle/service/ncm/ncm.cpp @@ -26,7 +26,7 @@ public: explicit ILocationResolver(Core::System& system_, FileSys::StorageId id) : ServiceFramework{system_, "ILocationResolver"}, storage{id} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ResolveProgramPath"}, FunctionInfo{1, nullptr, "RedirectProgramPath"}, FunctionInfo{2, nullptr, "ResolveApplicationControlPath"}, @@ -61,7 +61,7 @@ public: explicit IRegisteredLocationResolver(Core::System& system_) : ServiceFramework{system_, "IRegisteredLocationResolver"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ResolveProgramPath"}, FunctionInfo{1, nullptr, "RegisterProgramPath"}, FunctionInfo{2, nullptr, "UnregisterProgramPath"}, @@ -83,7 +83,7 @@ public: explicit IAddOnContentLocationResolver(Core::System& system_) : ServiceFramework{system_, "IAddOnContentLocationResolver"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ResolveAddOnContentPath"}, FunctionInfo{1, nullptr, "RegisterAddOnContentStorage"}, FunctionInfo{2, nullptr, "UnregisterAllAddOnContentPath"}, @@ -240,7 +240,7 @@ private: rb.Push(succeeded ? ResultSuccess : ResultUnknown); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IContentStorage::GeneratePlaceHolderId, "GeneratePlaceHolderId"}, FunctionInfo{1, &IContentStorage::CreatePlaceHolder, "CreatePlaceHolder"}, FunctionInfo{2, &IContentStorage::DeletePlaceHolder, "DeletePlaceHolder"}, @@ -345,7 +345,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IContentMetaDatabase::Set, "Set"}, FunctionInfo{2, &IContentMetaDatabase::Remove, "Remove"}, FunctionInfo{8, &IContentMetaDatabase::Has, "Has"}, @@ -359,7 +359,7 @@ class LR final : public ServiceFramework { public: explicit LR(Core::System& system_) : ServiceFramework{system_, "lr"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenLocationResolver"}, FunctionInfo{1, nullptr, "OpenRegisteredLocationResolver"}, FunctionInfo{2, nullptr, "RefreshLocationResolver"}, @@ -401,7 +401,7 @@ private: rb.PushIpcInterface(ctx, system, storage_id); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateContentStorage"}, FunctionInfo{1, nullptr, "CreateContentMetaDatabase"}, FunctionInfo{2, nullptr, "VerifyContentStorage"}, @@ -430,7 +430,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSystemVersion"} ); }; diff --git a/src/core/hle/service/nfc/nfc.cpp b/src/core/hle/service/nfc/nfc.cpp index 8199700a91..1071304d21 100644 --- a/src/core/hle/service/nfc/nfc.cpp +++ b/src/core/hle/service/nfc/nfc.cpp @@ -23,7 +23,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &NfcInterface::Initialize, "InitializeOld"}, FunctionInfoTyped{1, &NfcInterface::Finalize, "FinalizeOld"}, FunctionInfoTyped{2, &NfcInterface::GetState, "GetStateOld"}, @@ -56,7 +56,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &NfcInterface::Initialize, "InitializeOld"}, FunctionInfoTyped{1, &NfcInterface::Finalize, "FinalizeOld"}, FunctionInfoTyped{2, &NfcInterface::GetState, "GetStateOld"}, @@ -95,7 +95,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &MFIUser::Initialize, "Initialize"}, FunctionInfoTyped{1, &MFIUser::Finalize, "Finalize"}, FunctionInfoTyped{2, &MFIUser::ListDevices, "ListDevices"}, @@ -117,7 +117,7 @@ class IAm final : public ServiceFramework { public: explicit IAm(Core::System& system_) : ServiceFramework{system_, "NFC::IAm"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "Finalize"}, FunctionInfo{2, nullptr, "NotifyForegroundApplet"} @@ -144,7 +144,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NFC_AM::CreateAmNfcInterface, "CreateAmNfcInterface"} ); }; @@ -166,7 +166,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NFC_MF_U::CreateUserNfcInterface, "CreateUserNfcInterface"} ); }; @@ -188,7 +188,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NFC_U::CreateUserNfcInterface, "CreateUserNfcInterface"} ); }; @@ -210,7 +210,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NFC_SYS::CreateSystemNfcInterface, "CreateSystemNfcInterface"} ); }; diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index a37c8b3b18..41c7a3b097 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp @@ -19,7 +19,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &IUser::Initialize, "Initialize"}, FunctionInfoTyped{1, &IUser::Finalize, "Finalize"}, FunctionInfoTyped{2, &IUser::ListDevices, "ListDevices"}, @@ -56,7 +56,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &ISystem::InitializeSystem, "InitializeSystem"}, FunctionInfoTyped{1, &ISystem::FinalizeSystem, "FinalizeSystem"}, FunctionInfoTyped{2, &ISystem::ListDevices, "ListDevices"}, @@ -95,7 +95,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMapWithClass( + static constexpr auto functions = CreateStaticMapWithClass( FunctionInfoTyped{0, &IDebug::InitializeDebug, "InitializeDebug"}, FunctionInfoTyped{1, &IDebug::FinalizeDebug, "FinalizeDebug"}, FunctionInfoTyped{2, &IDebug::ListDevices, "ListDevices"}, @@ -155,7 +155,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IUserManager::CreateUserInterface, "CreateUserInterface"} ); }; @@ -177,7 +177,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ISystemManager::CreateSystemInterface, "CreateSystemInterface"} ); }; @@ -199,7 +199,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IDebugManager::CreateDebugInterface, "CreateDebugInterface"} ); }; diff --git a/src/core/hle/service/ngc/ngc.cpp b/src/core/hle/service/ngc/ngc.cpp index a015e8899e..c1cd7b932f 100644 --- a/src/core/hle/service/ngc/ngc.cpp +++ b/src/core/hle/service/ngc/ngc.cpp @@ -57,7 +57,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IService::Match, "Match"}, FunctionInfo{1, &IService::Filter, "Filter"} ); @@ -142,7 +142,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NgcServiceImpl::GetContentVersion, "GetContentVersion"}, FunctionInfo{1, &NgcServiceImpl::Check, "Check"}, FunctionInfo{2, &NgcServiceImpl::Mask, "Mask"}, @@ -156,7 +156,7 @@ class IServiceWithManagementApi final : public ServiceFramework, "OpenSaveData"}, @@ -226,7 +226,7 @@ public: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IUserService::Cmd0>, "Cmd0"} ); }; @@ -249,7 +249,7 @@ public: R_THROW(IPC::ResultNotSupported); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{106, nullptr, "Cmd106"}, FunctionInfo{107, nullptr, "Cmd107"}, FunctionInfo{108, D<&ISystemShimScopedObject::Cmd108>, "Cmd108"}, @@ -275,7 +275,7 @@ public: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISystemService::Cmd0>, "Cmd0"} ); }; diff --git a/src/core/hle/service/nifm/nifm.cpp b/src/core/hle/service/nifm/nifm.cpp index 2af0e1b78b..161b718121 100644 --- a/src/core/hle/service/nifm/nifm.cpp +++ b/src/core/hle/service/nifm/nifm.cpp @@ -321,7 +321,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IScanRequest::Submit, "Submit"}, FunctionInfo{1, &IScanRequest::IsProcessing, "IsProcessing"}, FunctionInfo{2, &IScanRequest::GetResult, "GetResult"}, @@ -467,7 +467,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IRequest::GetRequestState, "GetRequestState"}, FunctionInfo{1, &IRequest::GetResult, "GetResult"}, FunctionInfo{2, &IRequest::GetSystemEventReadableHandles, "GetSystemEventReadableHandles"}, @@ -514,7 +514,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Update"}, FunctionInfo{1, nullptr, "PersistOld"}, FunctionInfo{2, nullptr, "Persist"} @@ -1054,7 +1054,7 @@ void IGeneralService::GetCurrentAccessPoint(HLERequestContext& ctx) { } ServiceFrameworkBase::FunctionInfoBase const* IGeneralService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, &IGeneralService::GetClientId, "GetClientId"}, FunctionInfo{2, &IGeneralService::CreateScanRequest, "CreateScanRequest"}, FunctionInfo{4, &IGeneralService::CreateRequest, "CreateRequest"}, @@ -1138,7 +1138,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{4, &NetworkInterface::CreateGeneralServiceOld, "CreateGeneralServiceOld"}, FunctionInfo{5, &NetworkInterface::CreateGeneralService, "CreateGeneralService"} ); diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp index 5969ea2546..6e88410d1c 100644 --- a/src/core/hle/service/nim/nim.cpp +++ b/src/core/hle/service/nim/nim.cpp @@ -119,7 +119,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IShopServiceAsync::Cancel>, "Cancel"}, FunctionInfo{1, D<&IShopServiceAsync::GetSize>, "GetSize"}, FunctionInfo{2, D<&IShopServiceAsync::Read>, "Read"}, @@ -154,7 +154,7 @@ private: rb.PushIpcInterface(ctx, std::move(async_interface)); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IShopServiceAccessor::CreateAsyncInterface, "CreateAsyncInterface"} ); }; @@ -176,7 +176,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IShopServiceAccessServer::CreateAccessorInterface, "CreateAccessorInterface"} ); }; @@ -185,7 +185,7 @@ class NIM final : public ServiceFramework { public: explicit NIM(Core::System& system_) : ServiceFramework{system_, "nim"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateSystemUpdateTask"}, FunctionInfo{1, nullptr, "DestroySystemUpdateTask"}, FunctionInfo{2, nullptr, "ListSystemUpdateTask"}, @@ -451,7 +451,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NIM_ECA::CreateServerInterface, "CreateServerInterface"}, FunctionInfo{1, nullptr, "RefreshDebugAvailability"}, FunctionInfo{2, nullptr, "ClearDebugResponse"}, @@ -465,7 +465,7 @@ class NIM_SHP final : public ServiceFramework { public: explicit NIM_SHP(Core::System& system_) : ServiceFramework{system_, "nim:shp"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestDeviceAuthenticationToken"}, FunctionInfo{1, nullptr, "RequestCachedDeviceAuthenticationToken"}, FunctionInfo{2, nullptr, "RequestEdgeToken"}, @@ -566,7 +566,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IEnsureNetworkClockAvailabilityService::StartTask, "StartTask"}, FunctionInfo{1, &IEnsureNetworkClockAvailabilityService::GetFinishNotificationEvent, "GetFinishNotificationEvent"}, FunctionInfo{2, &IEnsureNetworkClockAvailabilityService::GetResult, "GetResult"}, @@ -610,7 +610,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NTC::OpenEnsureNetworkClockAvailabilityService, "OpenEnsureNetworkClockAvailabilityService"}, FunctionInfo{100, &NTC::SuspendAutonomicTimeCorrection, "SuspendAutonomicTimeCorrection"}, FunctionInfo{101, &NTC::ResumeAutonomicTimeCorrection, "ResumeAutonomicTimeCorrection"} @@ -621,7 +621,7 @@ class NIM_ECAS final : public ServiceFramework { public: explicit NIM_ECAS(Core::System& system_) : ServiceFramework{system_, "nim:ecas"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RegisterSpecialClient"}, FunctionInfo{1, nullptr, "UnregisterSpecialClient"} ); diff --git a/src/core/hle/service/npns/npns.cpp b/src/core/hle/service/npns/npns.cpp index 55593bcceb..63f2c86032 100644 --- a/src/core/hle/service/npns/npns.cpp +++ b/src/core/hle/service/npns/npns.cpp @@ -71,7 +71,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "ListenAll"}, FunctionInfo{2, C<&INpnsSystem::ListenTo>, "ListenTo"}, FunctionInfo{3, nullptr, "Receive"}, @@ -170,7 +170,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, nullptr, "ListenAll"}, FunctionInfo{2, nullptr, "ListenTo"}, FunctionInfo{3, nullptr, "Receive"}, diff --git a/src/core/hle/service/ns/account_proxy_interface.h b/src/core/hle/service/ns/account_proxy_interface.h index 625a707019..4bae80f889 100644 --- a/src/core/hle/service/ns/account_proxy_interface.h +++ b/src/core/hle/service/ns/account_proxy_interface.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateUserAccount"} ); }; diff --git a/src/core/hle/service/ns/application_manager_interface.cpp b/src/core/hle/service/ns/application_manager_interface.cpp index bbe7f5afdd..010551427b 100644 --- a/src/core/hle/service/ns/application_manager_interface.cpp +++ b/src/core/hle/service/ns/application_manager_interface.cpp @@ -26,7 +26,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IApplicationManagerInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IApplicationManagerInterface::ListApplicationRecord>, "ListApplicationRecord"}, FunctionInfo{1, nullptr, "GenerateApplicationRecordCount"}, FunctionInfo{2, D<&IApplicationManagerInterface::GetApplicationRecordUpdateSystemEvent>, "GetApplicationRecordUpdateSystemEvent"}, diff --git a/src/core/hle/service/ns/application_version_interface.h b/src/core/hle/service/ns/application_version_interface.h index b3559adbd3..2571474f6f 100644 --- a/src/core/hle/service/ns/application_version_interface.h +++ b/src/core/hle/service/ns/application_version_interface.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetLaunchRequiredVersion"}, FunctionInfo{1, nullptr, "UpgradeLaunchRequiredVersion"}, FunctionInfo{35, nullptr, "UpdateVersionList"}, diff --git a/src/core/hle/service/ns/async_result.cpp b/src/core/hle/service/ns/async_result.cpp index 57ab9c4d48..ccb576cb0f 100644 --- a/src/core/hle/service/ns/async_result.cpp +++ b/src/core/hle/service/ns/async_result.cpp @@ -9,7 +9,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IAsyncResult::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Get"}, FunctionInfo{1, D<&IAsyncResult::Cancel>, "Cancel"}, FunctionInfo{2, nullptr, "GetErrorContext"} // 4.0.0+ diff --git a/src/core/hle/service/ns/content_management_interface.h b/src/core/hle/service/ns/content_management_interface.h index 3d74eb1b4d..34f52c5f20 100644 --- a/src/core/hle/service/ns/content_management_interface.h +++ b/src/core/hle/service/ns/content_management_interface.h @@ -28,7 +28,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{11, D<&IContentManagementInterface::CalculateApplicationOccupiedSize>, "CalculateApplicationOccupiedSize"}, FunctionInfo{43, D<&IContentManagementInterface::CheckSdCardMountStatus>, "CheckSdCardMountStatus"}, FunctionInfo{47, D<&IContentManagementInterface::GetTotalSpaceSize>, "GetTotalSpaceSize"}, diff --git a/src/core/hle/service/ns/develop_interface.h b/src/core/hle/service/ns/develop_interface.h index d863cb4809..a73f436581 100644 --- a/src/core/hle/service/ns/develop_interface.h +++ b/src/core/hle/service/ns/develop_interface.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "LaunchProgram"}, FunctionInfo{1, nullptr, "TerminateProcess"}, FunctionInfo{2, nullptr, "TerminateProgram"}, diff --git a/src/core/hle/service/ns/document_interface.h b/src/core/hle/service/ns/document_interface.h index 2f148a483a..d0f1dd1253 100644 --- a/src/core/hle/service/ns/document_interface.h +++ b/src/core/hle/service/ns/document_interface.h @@ -24,7 +24,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{21, nullptr, "GetApplicationContentPath"}, FunctionInfo{23, D<&IDocumentInterface::ResolveApplicationContentPath>, "ResolveApplicationContentPath"}, FunctionInfo{92, D<&IDocumentInterface::GetRunningApplicationProgramId>, "GetRunningApplicationProgramId"} diff --git a/src/core/hle/service/ns/download_task_interface.h b/src/core/hle/service/ns/download_task_interface.h index 09efd67ca1..e121d93e9b 100644 --- a/src/core/hle/service/ns/download_task_interface.h +++ b/src/core/hle/service/ns/download_task_interface.h @@ -22,7 +22,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{701, nullptr, "ClearTaskStatusList"}, FunctionInfo{702, nullptr, "RequestDownloadTaskList"}, FunctionInfo{703, nullptr, "RequestEnsureDownloadTask"}, diff --git a/src/core/hle/service/ns/dynamic_rights_interface.cpp b/src/core/hle/service/ns/dynamic_rights_interface.cpp index 6a44d2a4cf..40e172b220 100644 --- a/src/core/hle/service/ns/dynamic_rights_interface.cpp +++ b/src/core/hle/service/ns/dynamic_rights_interface.cpp @@ -10,7 +10,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IDynamicRightsInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestApplicationRightsOnServer"}, FunctionInfo{1, nullptr, "RequestAssignRights"}, FunctionInfo{4, nullptr, "DeprecatedRequestAssignRightsToResume"}, diff --git a/src/core/hle/service/ns/ecommerce_interface.h b/src/core/hle/service/ns/ecommerce_interface.h index a8306f86e1..cb62c1c7d8 100644 --- a/src/core/hle/service/ns/ecommerce_interface.h +++ b/src/core/hle/service/ns/ecommerce_interface.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RequestLinkDevice"}, FunctionInfo{1, nullptr, "RequestCleanupAllPreInstalledApplications"}, FunctionInfo{2, nullptr, "RequestCleanupPreInstalledApplication"}, diff --git a/src/core/hle/service/ns/factory_reset_interface.cpp b/src/core/hle/service/ns/factory_reset_interface.cpp index 963221ce7f..6f2a5ff2aa 100644 --- a/src/core/hle/service/ns/factory_reset_interface.cpp +++ b/src/core/hle/service/ns/factory_reset_interface.cpp @@ -9,7 +9,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IFactoryResetInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{100, nullptr, "ResetToFactorySettings"}, FunctionInfo{101, nullptr, "ResetToFactorySettingsWithoutUserSaveData"}, FunctionInfo{102, nullptr, "ResetToFactorySettingsForRefurbishment"}, diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp index 9060fea204..03bad32709 100644 --- a/src/core/hle/service/ns/ns.cpp +++ b/src/core/hle/service/ns/ns.cpp @@ -21,7 +21,7 @@ class INotifyService final : public ServiceFramework { public: explicit INotifyService(Core::System& system_) : ServiceFramework{system_, "pdm:ntfy"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "NotifyAppletEvent" }, FunctionInfo{2, nullptr, "NotifyOperationModeChangeEvent" }, FunctionInfo{3, nullptr, "NotifyPowerStateChangeEvent" }, @@ -69,7 +69,7 @@ public: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1200, D<&IVulnerabilityManagerInterface::NeedsUpdateVulnerability>, "NeedsUpdateVulnerability"}, FunctionInfo{1201, nullptr, "UpdateSafeSystemVersionForDebug"}, FunctionInfo{1202, nullptr, "GetSafeSystemVersion"}, diff --git a/src/core/hle/service/ns/platform_service_manager.cpp b/src/core/hle/service/ns/platform_service_manager.cpp index 1d36bc05de..9e081ae769 100644 --- a/src/core/hle/service/ns/platform_service_manager.cpp +++ b/src/core/hle/service/ns/platform_service_manager.cpp @@ -28,7 +28,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IPlatformServiceManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IPlatformServiceManager::RequestLoad>, "RequestLoad"}, FunctionInfo{1, D<&IPlatformServiceManager::GetLoadState>, "GetLoadState"}, FunctionInfo{2, D<&IPlatformServiceManager::GetSize>, "GetSize"}, diff --git a/src/core/hle/service/ns/query_service.cpp b/src/core/hle/service/ns/query_service.cpp index 8f26c31d80..9bf6a20b96 100644 --- a/src/core/hle/service/ns/query_service.cpp +++ b/src/core/hle/service/ns/query_service.cpp @@ -15,7 +15,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IQueryService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "QueryAppletEvent"}, FunctionInfo{1, nullptr, "QueryPlayStatistics"}, FunctionInfo{2, nullptr, "QueryPlayStatisticsByUserAccountId"}, diff --git a/src/core/hle/service/ns/read_only_application_control_data_interface.cpp b/src/core/hle/service/ns/read_only_application_control_data_interface.cpp index 180466e499..4faf99c8b4 100644 --- a/src/core/hle/service/ns/read_only_application_control_data_interface.cpp +++ b/src/core/hle/service/ns/read_only_application_control_data_interface.cpp @@ -74,7 +74,7 @@ void SanitizeJPEGImageSize(std::vector& image) { } // namespace ServiceFrameworkBase::FunctionInfoBase const* IReadOnlyApplicationControlDataInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IReadOnlyApplicationControlDataInterface::GetApplicationControlData>, "GetApplicationControlData"}, FunctionInfo{1, D<&IReadOnlyApplicationControlDataInterface::GetApplicationDesiredLanguage>, "GetApplicationDesiredLanguage"}, FunctionInfo{2, D<&IReadOnlyApplicationControlDataInterface::ConvertApplicationLanguageToLanguageCode>, "ConvertApplicationLanguageToLanguageCode"}, @@ -134,7 +134,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IAsyncValue::GetSize>, "GetSize"}, FunctionInfo{1, D<&IAsyncValue::Get>, "Get"}, FunctionInfo{2, D<&IAsyncValue::Cancel>, "Cancel"}, diff --git a/src/core/hle/service/ns/read_only_application_record_interface.cpp b/src/core/hle/service/ns/read_only_application_record_interface.cpp index 5b5041d951..076a194401 100644 --- a/src/core/hle/service/ns/read_only_application_record_interface.cpp +++ b/src/core/hle/service/ns/read_only_application_record_interface.cpp @@ -12,7 +12,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IReadOnlyApplicationRecordInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IReadOnlyApplicationRecordInterface::HasApplicationRecord>, "HasApplicationRecord"}, FunctionInfo{1, nullptr, "NotifyApplicationFailure"}, FunctionInfo{2, D<&IReadOnlyApplicationRecordInterface::IsDataCorruptedResult>, "IsDataCorruptedResult"}, diff --git a/src/core/hle/service/ns/service_getter_interface.cpp b/src/core/hle/service/ns/service_getter_interface.cpp index ca29dbfd58..cff21ccb55 100644 --- a/src/core/hle/service/ns/service_getter_interface.cpp +++ b/src/core/hle/service/ns/service_getter_interface.cpp @@ -21,7 +21,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* IServiceGetterInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{7988, D<&IServiceGetterInterface::GetDynamicRightsInterface>, "GetDynamicRightsInterface"}, FunctionInfo{7989, D<&IServiceGetterInterface::GetReadOnlyApplicationControlDataInterface>, "GetReadOnlyApplicationControlDataInterface"}, FunctionInfo{7991, D<&IServiceGetterInterface::GetReadOnlyApplicationRecordInterface>, "GetReadOnlyApplicationRecordInterface"}, diff --git a/src/core/hle/service/ns/system_update_control.h b/src/core/hle/service/ns/system_update_control.h index daa7b6aa2c..e2236f1d93 100644 --- a/src/core/hle/service/ns/system_update_control.h +++ b/src/core/hle/service/ns/system_update_control.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "HasDownloaded"}, FunctionInfo{1, nullptr, "RequestCheckLatestUpdate"}, FunctionInfo{2, nullptr, "RequestDownloadLatestUpdate"}, diff --git a/src/core/hle/service/ns/system_update_interface.cpp b/src/core/hle/service/ns/system_update_interface.cpp index fd79d76e16..ed4f4666d0 100644 --- a/src/core/hle/service/ns/system_update_interface.cpp +++ b/src/core/hle/service/ns/system_update_interface.cpp @@ -11,7 +11,7 @@ namespace Service::NS { ServiceFrameworkBase::FunctionInfoBase const* ISystemUpdateInterface::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISystemUpdateInterface::GetBackgroundNetworkUpdateState>, "GetBackgroundNetworkUpdateState"}, FunctionInfo{1, D<&ISystemUpdateInterface::OpenSystemUpdateControl>, "OpenSystemUpdateControl"}, FunctionInfo{2, nullptr, "NotifyExFatDriverRequired"}, diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp index 2451a2326f..3dea5d7618 100644 --- a/src/core/hle/service/nvdrv/nvdrv.cpp +++ b/src/core/hle/service/nvdrv/nvdrv.cpp @@ -55,7 +55,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "GetEventHandle"}, FunctionInfo{2, nullptr, "ControlNotification"}, @@ -76,7 +76,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "GetAruid"}, FunctionInfo{2, nullptr, "ReadNextBlock"}, @@ -94,7 +94,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Open"}, FunctionInfo{1, nullptr, "Ioctl"}, FunctionInfo{2, nullptr, "Close"}, diff --git a/src/core/hle/service/nvdrv/nvdrv_interface.h b/src/core/hle/service/nvdrv/nvdrv_interface.h index 0375336197..d6135240a6 100644 --- a/src/core/hle/service/nvdrv/nvdrv_interface.h +++ b/src/core/hle/service/nvdrv/nvdrv_interface.h @@ -41,7 +41,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NVDRV::Open, "Open"}, FunctionInfo{1, &NVDRV::Ioctl1, "Ioctl"}, FunctionInfo{2, &NVDRV::Close, "Close"}, diff --git a/src/core/hle/service/nvdrv/nvmemp.h b/src/core/hle/service/nvdrv/nvmemp.h index ffbec7796e..db4981fa29 100644 --- a/src/core/hle/service/nvdrv/nvmemp.h +++ b/src/core/hle/service/nvdrv/nvmemp.h @@ -26,7 +26,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &NVMEMP::Open, "Open"}, FunctionInfo{1, &NVMEMP::GetAruid, "GetAruid"} ); diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver.cpp b/src/core/hle/service/nvnflinger/hos_binder_driver.cpp index a184d38c70..8b25720c09 100644 --- a/src/core/hle/service/nvnflinger/hos_binder_driver.cpp +++ b/src/core/hle/service/nvnflinger/hos_binder_driver.cpp @@ -12,7 +12,7 @@ namespace Service::Nvnflinger { ServiceFrameworkBase::FunctionInfoBase const* IHOSBinderDriver::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IHOSBinderDriver::TransactParcel>, "TransactParcel"}, FunctionInfo{1, C<&IHOSBinderDriver::AdjustRefcount>, "AdjustRefcount"}, FunctionInfo{2, C<&IHOSBinderDriver::GetNativeHandle>, "GetNativeHandle"}, diff --git a/src/core/hle/service/olsc/daemon_controller.cpp b/src/core/hle/service/olsc/daemon_controller.cpp index 6910341b1d..af56bd311f 100644 --- a/src/core/hle/service/olsc/daemon_controller.cpp +++ b/src/core/hle/service/olsc/daemon_controller.cpp @@ -10,7 +10,7 @@ namespace Service::OLSC { ServiceFrameworkBase::FunctionInfoBase const* IDaemonController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IDaemonController::GetApplicationAutoTransferSetting>, "GetApplicationAutoTransferSetting"}, FunctionInfo{1, D<&IDaemonController::SetApplicationAutoTransferSetting>, "SetApplicationAutoTransferSetting"}, FunctionInfo{2, D<&IDaemonController::GetGlobalAutoUploadSetting>, "GetGlobalAutoUploadSetting"}, diff --git a/src/core/hle/service/olsc/native_handle_holder.cpp b/src/core/hle/service/olsc/native_handle_holder.cpp index 9107c373c5..cfabb97499 100644 --- a/src/core/hle/service/olsc/native_handle_holder.cpp +++ b/src/core/hle/service/olsc/native_handle_holder.cpp @@ -13,7 +13,7 @@ namespace Service::OLSC { ServiceFrameworkBase::FunctionInfoBase const* INativeHandleHolder::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&INativeHandleHolder::GetNativeHandle>, "GetNativeHandle"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/olsc/olsc.cpp b/src/core/hle/service/olsc/olsc.cpp index 9324156510..0386504b83 100644 --- a/src/core/hle/service/olsc/olsc.cpp +++ b/src/core/hle/service/olsc/olsc.cpp @@ -24,7 +24,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{100, nullptr, "OpenBgAgentController" } ); }; @@ -116,7 +116,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IOlscServiceForSystemService::GetTransferTaskListController>, "GetTransferTaskListController"}, FunctionInfo{1, D<&IOlscServiceForSystemService::GetRemoteStorageController>, "GetRemoteStorageController"}, FunctionInfo{2, D<&IOlscServiceForSystemService::GetDaemonController>, "GetDaemonController"}, diff --git a/src/core/hle/service/olsc/olsc_service_for_application.cpp b/src/core/hle/service/olsc/olsc_service_for_application.cpp index 23c0511d57..66a339369f 100644 --- a/src/core/hle/service/olsc/olsc_service_for_application.cpp +++ b/src/core/hle/service/olsc/olsc_service_for_application.cpp @@ -10,7 +10,7 @@ namespace Service::OLSC { ServiceFrameworkBase::FunctionInfoBase const* IOlscServiceForApplication::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IOlscServiceForApplication::Initialize>, "Initialize"}, FunctionInfo{10, nullptr, "VerifySaveDataBackupLicenseAsync"}, FunctionInfo{13, D<&IOlscServiceForApplication::GetSaveDataBackupSetting>, "GetSaveDataBackupSetting"}, diff --git a/src/core/hle/service/olsc/remote_storage_controller.cpp b/src/core/hle/service/olsc/remote_storage_controller.cpp index 6d4b7be3b6..aaf0456f7f 100644 --- a/src/core/hle/service/olsc/remote_storage_controller.cpp +++ b/src/core/hle/service/olsc/remote_storage_controller.cpp @@ -10,7 +10,7 @@ namespace Service::OLSC { ServiceFrameworkBase::FunctionInfoBase const* IRemoteStorageController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetSaveDataArchiveInfoBySaveDataId"}, FunctionInfo{1, nullptr, "GetSaveDataArchiveInfoByApplicationId"}, FunctionInfo{3, nullptr, "GetSaveDataArchiveCount"}, diff --git a/src/core/hle/service/olsc/transfer_task_list_controller.cpp b/src/core/hle/service/olsc/transfer_task_list_controller.cpp index 2159e465f2..5023f0c892 100644 --- a/src/core/hle/service/olsc/transfer_task_list_controller.cpp +++ b/src/core/hle/service/olsc/transfer_task_list_controller.cpp @@ -12,7 +12,7 @@ namespace Service::OLSC { ServiceFrameworkBase::FunctionInfoBase const* ITransferTaskListController::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetTransferTaskCountForOcean"}, FunctionInfo{1, nullptr, "GetTransferTaskInfoForOcean"}, FunctionInfo{2, nullptr, "ListTransferTaskInfoForOcean"}, diff --git a/src/core/hle/service/omm/operation_mode_manager.h b/src/core/hle/service/omm/operation_mode_manager.h index 797a3c01d5..605d8439dd 100644 --- a/src/core/hle/service/omm/operation_mode_manager.h +++ b/src/core/hle/service/omm/operation_mode_manager.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetOperationMode"}, FunctionInfo{1, nullptr, "GetOperationModeChangeEvent"}, FunctionInfo{2, nullptr, "EnableAudioVisual"}, diff --git a/src/core/hle/service/omm/policy_manager_system.h b/src/core/hle/service/omm/policy_manager_system.h index efe2570e00..efecc59850 100644 --- a/src/core/hle/service/omm/policy_manager_system.h +++ b/src/core/hle/service/omm/policy_manager_system.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetAutoPowerDownEvent"}, FunctionInfo{1, nullptr, "IsAutoPowerDownRequested"}, FunctionInfo{2, nullptr, "Unknown2"}, diff --git a/src/core/hle/service/omm/power_state_interface.h b/src/core/hle/service/omm/power_state_interface.h index a825cbe878..408d0ff578 100644 --- a/src/core/hle/service/omm/power_state_interface.h +++ b/src/core/hle/service/omm/power_state_interface.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetState"}, FunctionInfo{1, nullptr, "EnterSleep"}, FunctionInfo{2, nullptr, "GetLastWakeReason"}, diff --git a/src/core/hle/service/pcie/pcie.cpp b/src/core/hle/service/pcie/pcie.cpp index eca447d36f..f350c37039 100644 --- a/src/core/hle/service/pcie/pcie.cpp +++ b/src/core/hle/service/pcie/pcie.cpp @@ -17,7 +17,7 @@ class ISession final : public ServiceFramework { public: explicit ISession(Core::System& system_) : ServiceFramework{system_, "ISession"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "QueryFunctions"}, FunctionInfo{1, nullptr, "AcquireFunction"}, FunctionInfo{2, nullptr, "ReleaseFunction"}, @@ -52,7 +52,7 @@ class PCIE final : public ServiceFramework { public: explicit PCIE(Core::System& system_) : ServiceFramework{system_, "pcie"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "RegisterClassDriver"}, FunctionInfo{1, nullptr, "QueryFunctionsUnregistered"} ); @@ -65,7 +65,7 @@ class PCIE_LOG final : public ServiceFramework { public: explicit PCIE_LOG(Core::System& system_) : ServiceFramework{system_, "pcie:log"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetLoggedState"}, FunctionInfo{1, nullptr, "GetLoggedStateEvent"} ); diff --git a/src/core/hle/service/pctl/pctl.cpp b/src/core/hle/service/pctl/pctl.cpp index 18ca23c5cd..ca30184d1a 100644 --- a/src/core/hle/service/pctl/pctl.cpp +++ b/src/core/hle/service/pctl/pctl.cpp @@ -452,7 +452,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, D<&IParentalControlService::Initialize>, "Initialize"}, FunctionInfo{1001, D<&IParentalControlService::CheckFreeCommunicationPermission>, "CheckFreeCommunicationPermission"}, FunctionInfo{1002, D<&IParentalControlService::ConfirmLaunchApplicationPermission>, "ConfirmLaunchApplicationPermission"}, @@ -619,7 +619,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IParentalControlServiceFactory::CreateService>, "CreateService"}, FunctionInfo{1, D<&IParentalControlServiceFactory::CreateServiceWithoutInitialize>, "CreateServiceWithoutInitialize"} ); diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp index b46ca25aa3..3070fadd3c 100644 --- a/src/core/hle/service/pcv/pcv.cpp +++ b/src/core/hle/service/pcv/pcv.cpp @@ -17,7 +17,7 @@ class PCV final : public ServiceFramework { public: explicit PCV(Core::System& system_) : ServiceFramework{system_, "pcv"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetPowerEnabled"}, FunctionInfo{1, nullptr, "SetClockEnabled"}, FunctionInfo{2, nullptr, "SetClockRate"}, @@ -58,7 +58,7 @@ class PCV_ARB final : public ServiceFramework { public: explicit PCV_ARB(Core::System& system_) : ServiceFramework{system_, "pcv:arb"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ReleaseControl"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -70,7 +70,7 @@ class PCV_IMM final : public ServiceFramework { public: explicit PCV_IMM(Core::System& system_) : ServiceFramework{system_, "pcv:imm"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetClockRate"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -105,7 +105,7 @@ private: rb.Push(clock_rate); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetClockEnabled"}, FunctionInfo{1, nullptr, "SetClockDisabled"}, FunctionInfo{2, nullptr, "SetResetAsserted"}, @@ -144,7 +144,7 @@ private: rb.PushIpcInterface(ctx, system, device_code); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &CLKRST::OpenSession, "OpenSession"}, FunctionInfo{1, nullptr, "GetTemperatureThresholds"}, FunctionInfo{2, nullptr, "SetTemperature"}, @@ -158,7 +158,7 @@ class CLKRST_A final : public ServiceFramework { public: explicit CLKRST_A(Core::System& system_) : ServiceFramework{system_, "clkrst:a"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ReleaseControl"} ); FunctionInfoBase const* FindRequest(u32 key) override { diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index 85f196b859..f347cc7340 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -70,7 +70,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &BootMode::GetBootMode, "GetBootMode"}, FunctionInfo{1, &BootMode::SetMaintenanceBoot, "SetMaintenanceBoot"} ); @@ -153,7 +153,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetJitDebugProcessIdList"}, FunctionInfo{1, nullptr, "StartProcess"}, FunctionInfo{2, &DebugMonitor::GetProcessId, "GetProcessId"}, @@ -214,7 +214,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &Info::GetProgramId, "GetProgramId"}, FunctionInfo{65000, &Info::AtmosphereGetProcessId, "AtmosphereGetProcessId"}, FunctionInfo{65001, nullptr, "AtmosphereHasLaunchedProgram"}, @@ -237,7 +237,7 @@ private: GetApplicationPidGeneric(system.Kernel(), ctx, list); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "LaunchProgram"}, FunctionInfo{1, nullptr, "TerminateProcess"}, FunctionInfo{2, nullptr, "TerminateProgram"}, diff --git a/src/core/hle/service/prepo/prepo.cpp b/src/core/hle/service/prepo/prepo.cpp index f5c04b1eed..6068d6392a 100644 --- a/src/core/hle/service/prepo/prepo.cpp +++ b/src/core/hle/service/prepo/prepo.cpp @@ -180,7 +180,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{10100, &PlayReport::SaveReport, "SaveReportOld"}, FunctionInfo{10101, &PlayReport::SaveReportWithUser, "SaveReportWithUserOld"}, FunctionInfo{10102, &PlayReport::SaveReport, "SaveReportOld2"}, diff --git a/src/core/hle/service/psc/ovln/receiver.cpp b/src/core/hle/service/psc/ovln/receiver.cpp index b1a6fd4a18..55045ed5e1 100644 --- a/src/core/hle/service/psc/ovln/receiver.cpp +++ b/src/core/hle/service/psc/ovln/receiver.cpp @@ -10,7 +10,7 @@ namespace Service::PSC { ServiceFrameworkBase::FunctionInfoBase const* IReceiver::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IReceiver::AddSource>, "AddSource"}, FunctionInfo{1, D<&IReceiver::RemoveSource>, "RemoveSource"}, FunctionInfo{2, D<&IReceiver::GetReceiveEventHandle>, "GetReceiveEventHandle"}, diff --git a/src/core/hle/service/psc/ovln/receiver_service.cpp b/src/core/hle/service/psc/ovln/receiver_service.cpp index a15a9449ba..98be2d89dd 100644 --- a/src/core/hle/service/psc/ovln/receiver_service.cpp +++ b/src/core/hle/service/psc/ovln/receiver_service.cpp @@ -11,7 +11,7 @@ namespace Service::PSC { ServiceFrameworkBase::FunctionInfoBase const* IReceiverService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IReceiverService::OpenReceiver>, "OpenReceiver"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/psc/ovln/sender.cpp b/src/core/hle/service/psc/ovln/sender.cpp index 58685c1155..a0d057a6a1 100644 --- a/src/core/hle/service/psc/ovln/sender.cpp +++ b/src/core/hle/service/psc/ovln/sender.cpp @@ -10,7 +10,7 @@ namespace Service::PSC { ServiceFrameworkBase::FunctionInfoBase const* ISender::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISender::Send>, "Send"}, FunctionInfo{1, nullptr, "GetUnreceivedMessageCount"} ); diff --git a/src/core/hle/service/psc/ovln/sender_service.cpp b/src/core/hle/service/psc/ovln/sender_service.cpp index 0f4293466c..02daf096ad 100644 --- a/src/core/hle/service/psc/ovln/sender_service.cpp +++ b/src/core/hle/service/psc/ovln/sender_service.cpp @@ -11,7 +11,7 @@ namespace Service::PSC { ServiceFrameworkBase::FunctionInfoBase const* ISenderService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISenderService::OpenSender>, "OpenSender"} ); return HandlerTableGenerateWithFind(key, functions); diff --git a/src/core/hle/service/psc/pm_control.h b/src/core/hle/service/psc/pm_control.h index bdbf61e41c..55c7663564 100644 --- a/src/core/hle/service/psc/pm_control.h +++ b/src/core/hle/service/psc/pm_control.h @@ -18,7 +18,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "DispatchRequest"}, FunctionInfo{2, nullptr, "GetResult"}, diff --git a/src/core/hle/service/psc/pm_module.cpp b/src/core/hle/service/psc/pm_module.cpp index 24438c577b..94f586203a 100644 --- a/src/core/hle/service/psc/pm_module.cpp +++ b/src/core/hle/service/psc/pm_module.cpp @@ -9,7 +9,7 @@ namespace Service::PSC { ServiceFrameworkBase::FunctionInfoBase const* IPmModule::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "GetRequest"}, FunctionInfo{2, nullptr, "Acknowledge"}, diff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cpp index 11a22b5270..ae1ff1f963 100644 --- a/src/core/hle/service/psc/psc.cpp +++ b/src/core/hle/service/psc/psc.cpp @@ -22,7 +22,7 @@ class PSC_L final : public ServiceFramework { public: explicit PSC_L(Core::System& system_) : ServiceFramework{system_, "psc:l"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize_3"}, FunctionInfo{1, nullptr, "Lock"}, FunctionInfo{2, nullptr, "Unlock"}, @@ -38,7 +38,7 @@ class INS_R final : public ServiceFramework { public: explicit INS_R(Core::System& system_) : ServiceFramework{system_, "ins:r"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetInputSourceState"}, FunctionInfo{1, nullptr, "GetTriggerTargetEvent"} ); @@ -51,7 +51,7 @@ class INS_S final : public ServiceFramework { public: explicit INS_S(Core::System& system_) : ServiceFramework{system_, "ins:s"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetNotifyEvent"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -63,7 +63,7 @@ class HSHL_SYS final : public ServiceFramework { public: explicit HSHL_SYS(Core::System& system_) : ServiceFramework{system_, "hshl:sys"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetBatteryPercentage"}, FunctionInfo{1, nullptr, "GetChargerType"}, FunctionInfo{2, nullptr, "OpenChargeSession"}, @@ -90,7 +90,7 @@ class HSHL_SET final : public ServiceFramework { public: explicit HSHL_SET(Core::System& system_) : ServiceFramework{system_, "hshl:set"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenChargeSession_2"}, FunctionInfo{1, nullptr, "OpenThermalSession_2"}, FunctionInfo{2, nullptr, "SetClockRate"}, @@ -120,7 +120,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IPmService::GetPmModule>, "GetPmModule"} ); }; diff --git a/src/core/hle/service/psc/time/alarms.h b/src/core/hle/service/psc/time/alarms.h index b44b411266..cc17a87e7f 100644 --- a/src/core/hle/service/psc/time/alarms.h +++ b/src/core/hle/service/psc/time/alarms.h @@ -118,7 +118,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IAlarmService::CreateWakeupAlarm, "CreateWakeupAlarm"}, FunctionInfo{1, &IAlarmService::CreateBackgroundTaskAlarm, "CreateBackgroundTaskAlarm"} ); @@ -139,7 +139,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ISteadyClockAlarm::GetAlarmEvent, "GetAlarmEvent"}, FunctionInfo{1, &ISteadyClockAlarm::Enable, "Enable"}, FunctionInfo{2, &ISteadyClockAlarm::Disable, "Disable"}, diff --git a/src/core/hle/service/psc/time/power_state_service.cpp b/src/core/hle/service/psc/time/power_state_service.cpp index d3d7f741bb..16d387b1f7 100644 --- a/src/core/hle/service/psc/time/power_state_service.cpp +++ b/src/core/hle/service/psc/time/power_state_service.cpp @@ -10,7 +10,7 @@ namespace Service::PSC::Time { ServiceFrameworkBase::FunctionInfoBase const* IPowerStateRequestHandler::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&IPowerStateRequestHandler::GetPowerStateRequestEventReadableHandle>, "GetPowerStateRequestEventReadableHandle"}, FunctionInfo{1, D<&IPowerStateRequestHandler::GetAndClearPowerStateRequest>, "GetAndClearPowerStateRequest"} ); diff --git a/src/core/hle/service/psc/time/service_manager.cpp b/src/core/hle/service/psc/time/service_manager.cpp index b7ecb168c7..3188eef94c 100644 --- a/src/core/hle/service/psc/time/service_manager.cpp +++ b/src/core/hle/service/psc/time/service_manager.cpp @@ -14,7 +14,7 @@ namespace Service::PSC::Time { ServiceFrameworkBase::FunctionInfoBase const* ServiceManager::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ServiceManager::GetStaticServiceAsUser>, "GetStaticServiceAsUser"}, FunctionInfo{5, D<&ServiceManager::GetStaticServiceAsAdmin>, "GetStaticServiceAsAdmin"}, FunctionInfo{6, D<&ServiceManager::GetStaticServiceAsRepair>, "GetStaticServiceAsRepair"}, diff --git a/src/core/hle/service/psc/time/static.cpp b/src/core/hle/service/psc/time/static.cpp index a1e345e0eb..03f2079297 100644 --- a/src/core/hle/service/psc/time/static.cpp +++ b/src/core/hle/service/psc/time/static.cpp @@ -34,7 +34,7 @@ constexpr Result GetTimeFromTimePointAndContext(s64* out_time, SteadyClockTimePo } // namespace ServiceFrameworkBase::FunctionInfoBase const* StaticService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&StaticService::GetStandardUserSystemClock>, "GetStandardUserSystemClock"}, FunctionInfo{1, D<&StaticService::GetStandardNetworkSystemClock>, "GetStandardNetworkSystemClock"}, FunctionInfo{2, D<&StaticService::GetStandardSteadyClock>, "GetStandardSteadyClock"}, diff --git a/src/core/hle/service/psc/time/steady_clock.cpp b/src/core/hle/service/psc/time/steady_clock.cpp index d6511413a6..6ab74cddcb 100644 --- a/src/core/hle/service/psc/time/steady_clock.cpp +++ b/src/core/hle/service/psc/time/steady_clock.cpp @@ -12,7 +12,7 @@ namespace Service::PSC::Time { ServiceFrameworkBase::FunctionInfoBase const* SteadyClock::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&SteadyClock::GetCurrentTimePoint>, "GetCurrentTimePoint"}, FunctionInfo{2, D<&SteadyClock::GetTestOffset>, "GetTestOffset"}, FunctionInfo{3, D<&SteadyClock::SetTestOffset>, "SetTestOffset"}, diff --git a/src/core/hle/service/psc/time/system_clock.cpp b/src/core/hle/service/psc/time/system_clock.cpp index 5d9907146d..c861234ec0 100644 --- a/src/core/hle/service/psc/time/system_clock.cpp +++ b/src/core/hle/service/psc/time/system_clock.cpp @@ -12,7 +12,7 @@ namespace Service::PSC::Time { ServiceFrameworkBase::FunctionInfoBase const* SystemClock::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&SystemClock::GetCurrentTime>, "GetCurrentTime"}, FunctionInfo{1, D<&SystemClock::SetCurrentTime>, "SetCurrentTime"}, FunctionInfo{2, D<&SystemClock::GetSystemClockContext>, "GetSystemClockContext"}, diff --git a/src/core/hle/service/psc/time/time_zone_service.cpp b/src/core/hle/service/psc/time/time_zone_service.cpp index 750ed3496f..7616801743 100644 --- a/src/core/hle/service/psc/time/time_zone_service.cpp +++ b/src/core/hle/service/psc/time/time_zone_service.cpp @@ -14,7 +14,7 @@ namespace Service::PSC::Time { ServiceFrameworkBase::FunctionInfoBase const* TimeZoneService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&TimeZoneService::GetDeviceLocationName>, "GetDeviceLocationName"}, FunctionInfo{1, D<&TimeZoneService::SetDeviceLocationName>, "SetDeviceLocationName"}, FunctionInfo{2, D<&TimeZoneService::GetTotalLocationNameCount>, "GetTotalLocationNameCount"}, diff --git a/src/core/hle/service/ptm/psm.cpp b/src/core/hle/service/ptm/psm.cpp index 32e9cb070a..3bf689c765 100644 --- a/src/core/hle/service/ptm/psm.cpp +++ b/src/core/hle/service/ptm/psm.cpp @@ -105,7 +105,7 @@ private: rb.Push(ResultSuccess); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IPsmSession::BindStateChangeEvent, "BindStateChangeEvent"}, FunctionInfo{1, &IPsmSession::UnbindStateChangeEvent, "UnbindStateChangeEvent"}, FunctionInfo{2, &IPsmSession::SetChargerTypeChangeEventEnabled, "SetChargerTypeChangeEventEnabled"}, diff --git a/src/core/hle/service/ptm/psm.h b/src/core/hle/service/ptm/psm.h index a0e76002e6..60ae8d716d 100644 --- a/src/core/hle/service/ptm/psm.h +++ b/src/core/hle/service/ptm/psm.h @@ -32,7 +32,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &PSM::GetBatteryChargePercentage, "GetBatteryChargePercentage"}, FunctionInfo{1, &PSM::GetChargerType, "GetChargerType"}, FunctionInfo{2, nullptr, "EnableBatteryCharging"}, diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index a136ccf7ef..07cd6318a1 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -19,7 +19,7 @@ public: explicit PSM_MANU(Core::System& system_) : ServiceFramework{system_, "psm:manu"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "EnableVdd50StateControl"}, FunctionInfo{1, nullptr, "DisableVdd50StateControl"}, FunctionInfo{2, nullptr, "SetVdd50State"} @@ -34,7 +34,7 @@ public: explicit POWCTL(Core::System& system_) : ServiceFramework{system_, "powctl"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenSession"} ); FunctionInfoBase const* FindRequest(u32 key) override { diff --git a/src/core/hle/service/ptm/ts.cpp b/src/core/hle/service/ptm/ts.cpp index e633ae644b..ec0493aa37 100644 --- a/src/core/hle/service/ptm/ts.cpp +++ b/src/core/hle/service/ptm/ts.cpp @@ -34,7 +34,7 @@ private: rb.Push(temperature); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetTemperatureRange"}, FunctionInfo{2, nullptr, "SetMeasurementMode"}, FunctionInfo{4, &ISession::GetTemperature, "GetTemperature"} diff --git a/src/core/hle/service/ptm/ts.h b/src/core/hle/service/ptm/ts.h index 91eec4f100..500a1b8d17 100644 --- a/src/core/hle/service/ptm/ts.h +++ b/src/core/hle/service/ptm/ts.h @@ -24,7 +24,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetTemperatureRange"}, FunctionInfo{1, &TS::GetTemperature, "GetTemperature"}, FunctionInfo{2, nullptr, "SetMeasurementMode"}, diff --git a/src/core/hle/service/ro/ro.cpp b/src/core/hle/service/ro/ro.cpp index 79a1688fa6..5bd6b18087 100644 --- a/src/core/hle/service/ro/ro.cpp +++ b/src/core/hle/service/ro/ro.cpp @@ -556,7 +556,7 @@ public: } private: - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&RoInterface::MapManualLoadModuleMemory>, "MapManualLoadModuleMemory"}, FunctionInfo{1, C<&RoInterface::UnmapManualLoadModuleMemory>, "UnmapManualLoadModuleMemory"}, FunctionInfo{2, C<&RoInterface::RegisterModuleInfo>, "RegisterModuleInfo"}, @@ -581,7 +581,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetProcessModuleInfo" } ); }; diff --git a/src/core/hle/service/set/factory_settings_server.h b/src/core/hle/service/set/factory_settings_server.h index 46cd2ed6b7..c35c6776d2 100644 --- a/src/core/hle/service/set/factory_settings_server.h +++ b/src/core/hle/service/set/factory_settings_server.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetBluetoothBdAddress"}, FunctionInfo{1, nullptr, "GetConfigurationId1"}, FunctionInfo{2, nullptr, "GetAccelerometerOffset"}, diff --git a/src/core/hle/service/set/firmware_debug_settings_server.h b/src/core/hle/service/set/firmware_debug_settings_server.h index 03fa5a59e7..38f660d2a5 100644 --- a/src/core/hle/service/set/firmware_debug_settings_server.h +++ b/src/core/hle/service/set/firmware_debug_settings_server.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{2, nullptr, "SetSettingsItemValue"}, FunctionInfo{3, nullptr, "ResetSettingsItemValue"}, FunctionInfo{4, nullptr, "CreateSettingsItemKeyIterator"}, diff --git a/src/core/hle/service/set/settings_server.cpp b/src/core/hle/service/set/settings_server.cpp index 2835510c02..6576b8121f 100644 --- a/src/core/hle/service/set/settings_server.cpp +++ b/src/core/hle/service/set/settings_server.cpp @@ -90,7 +90,7 @@ LanguageCode GetLanguageCodeFromIndex(std::size_t index) { } ServiceFrameworkBase::FunctionInfoBase const* ISettingsServer::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISettingsServer::GetLanguageCode>, "GetLanguageCode"}, FunctionInfo{1, C<&ISettingsServer::GetAvailableLanguageCodes>, "GetAvailableLanguageCodes"}, FunctionInfo{2, C<&ISettingsServer::MakeLanguageCode>, "MakeLanguageCode"}, diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index 35721dac58..3cea0997f6 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp @@ -115,7 +115,7 @@ Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System& } ServiceFrameworkBase::FunctionInfoBase const* ISystemSettingsServer::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&ISystemSettingsServer::SetLanguageCode>, "SetLanguageCode"}, FunctionInfo{1, nullptr, "SetNetworkSettings"}, FunctionInfo{2, nullptr, "GetNetworkSettings"}, diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp index 33d5fba086..a1a36b63a2 100644 --- a/src/core/hle/service/sm/sm.cpp +++ b/src/core/hle/service/sm/sm.cpp @@ -137,7 +137,7 @@ private: FunctionInfoBase const* FindRequestTipc(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SM::Initialize, "Initialize"}, FunctionInfo{1, &SM::GetServiceTipc, "GetService"}, FunctionInfo{2, &SM::RegisterServiceTipc, "RegisterService"}, diff --git a/src/core/hle/service/sm/sm_controller.h b/src/core/hle/service/sm/sm_controller.h index a08a374ed4..7f62b242a8 100644 --- a/src/core/hle/service/sm/sm_controller.h +++ b/src/core/hle/service/sm/sm_controller.h @@ -29,7 +29,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &Controller::ConvertCurrentObjectToDomain, "ConvertCurrentObjectToDomain"}, FunctionInfo{1, nullptr, "CopyFromCurrentDomain"}, FunctionInfo{2, &Controller::CloneCurrentObject, "CloneCurrentObject"}, diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h index ecb156ebba..b4a6884bd8 100644 --- a/src/core/hle/service/sockets/bsd.h +++ b/src/core/hle/service/sockets/bsd.h @@ -193,7 +193,7 @@ protected: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &BSD_USA::RegisterClient, "RegisterClient"}, FunctionInfo{1, &BSD_USA::StartMonitoring, "StartMonitoring"}, FunctionInfo{2, &BSD_USA::Socket, "Socket"}, @@ -252,7 +252,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetIfUp"}, FunctionInfo{1, nullptr, "SetIfUpWithEvent"}, FunctionInfo{2, nullptr, "CancelIf"}, @@ -280,7 +280,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateUserService"} ); }; diff --git a/src/core/hle/service/sockets/nsd.h b/src/core/hle/service/sockets/nsd.h index 0c21ea7356..220f076e8e 100644 --- a/src/core/hle/service/sockets/nsd.h +++ b/src/core/hle/service/sockets/nsd.h @@ -29,7 +29,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{5, nullptr, "GetSettingUrl"}, FunctionInfo{10, nullptr, "GetSettingName"}, FunctionInfo{11, &NSD::GetEnvironmentIdentifier, "GetEnvironmentIdentifier"}, diff --git a/src/core/hle/service/sockets/sfdnsres.h b/src/core/hle/service/sockets/sfdnsres.h index 194a25ec71..b9eab0e08a 100644 --- a/src/core/hle/service/sockets/sfdnsres.h +++ b/src/core/hle/service/sockets/sfdnsres.h @@ -30,7 +30,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetDnsAddressesPrivateRequest"}, FunctionInfo{1, nullptr, "GetDnsAddressPrivateRequest"}, FunctionInfo{2, &SFDNSRES::GetHostByNameRequest, "GetHostByNameRequest"}, @@ -58,7 +58,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Cmd0"}, FunctionInfo{1, nullptr, "Cmd1"}, FunctionInfo{2, nullptr, "Cmd2"} diff --git a/src/core/hle/service/sockets/sockets.cpp b/src/core/hle/service/sockets/sockets.cpp index 041b8e8eb9..61112e3316 100644 --- a/src/core/hle/service/sockets/sockets.cpp +++ b/src/core/hle/service/sockets/sockets.cpp @@ -17,7 +17,7 @@ public: explicit ETHC_C(Core::System& system_) : ServiceFramework{system_, "ethc:c"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Initialize"}, FunctionInfo{1, nullptr, "Cancel"}, FunctionInfo{2, nullptr, "GetResult"}, @@ -36,7 +36,7 @@ public: explicit ETHC_I(Core::System& system_) : ServiceFramework{system_, "ethc:i"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetReadableHandle"}, FunctionInfo{1, nullptr, "Cancel"}, FunctionInfo{2, nullptr, "GetResult"}, @@ -53,7 +53,7 @@ public: explicit ISfDriverServiceCreator(Core::System& system_) : ServiceFramework{system_, "eth:nd"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateDriverService"} ); FunctionInfoBase const* FindRequest(u32 key) override { diff --git a/src/core/hle/service/spl/spl.h b/src/core/hle/service/spl/spl.h index 3e7874870b..619713ed65 100644 --- a/src/core/hle/service/spl/spl.h +++ b/src/core/hle/service/spl/spl.h @@ -22,7 +22,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{5, &SPL::SetConfig, "SetConfig"}, @@ -41,7 +41,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{2, &SPL::GenerateAesKek, "GenerateAesKek"}, @@ -69,7 +69,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{2, nullptr, "GenerateAesKek"}, @@ -102,7 +102,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{2, nullptr, "GenerateAesKek"}, @@ -133,7 +133,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{2, nullptr, "GenerateAesKek"}, @@ -169,7 +169,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &SPL::GetConfig, "GetConfig"}, FunctionInfo{1, &SPL::ModularExponentiate, "ModularExponentiate"}, FunctionInfo{2, nullptr, "GenerateAesKek"}, diff --git a/src/core/hle/service/spl/spl_module.cpp b/src/core/hle/service/spl/spl_module.cpp index 51d6403558..9a970d81d1 100644 --- a/src/core/hle/service/spl/spl_module.cpp +++ b/src/core/hle/service/spl/spl_module.cpp @@ -210,7 +210,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &CSRNG::GenerateRandomBytes, "GenerateRandomBytes"} ); }; diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index e0559bf836..8f0202cfb4 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -392,7 +392,7 @@ private: R_SUCCEED(); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISslConnection::SetSocketDescriptor>, "SetSocketDescriptor"}, FunctionInfo{1, D<&ISslConnection::SetHostName>, "SetHostName"}, FunctionInfo{2, D<&ISslConnection::SetVerifyOption>, "SetVerifyOption"}, @@ -543,7 +543,7 @@ private: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ISslContext::SetOption, "SetOption"}, FunctionInfo{1, &ISslContext::GetOption, "GetOption"}, FunctionInfo{2, &ISslContext::CreateConnection, "CreateConnection"}, @@ -614,7 +614,7 @@ private: } private: - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &ISslService::CreateContext, "CreateContext"}, FunctionInfo{1, nullptr, "GetContextCount"}, FunctionInfo{2, D<&ISslService::GetCertificates>, "GetCertificates"}, @@ -706,7 +706,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, D<&ISslServiceForSystem::CreateContext>, "CreateContext"}, FunctionInfo{1, D<&ISslServiceForSystem::GetContextCount>, "GetContextCount"}, FunctionInfo{2, D<&ISslServiceForSystem::GetCertificates>, "GetCertificates"}, diff --git a/src/core/hle/service/tma/tma.cpp b/src/core/hle/service/tma/tma.cpp index 5432a45aa6..13df6e098f 100644 --- a/src/core/hle/service/tma/tma.cpp +++ b/src/core/hle/service/tma/tma.cpp @@ -24,7 +24,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetServiceInterface"} ); }; diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp index 49ca12b9ac..2b0fb043df 100644 --- a/src/core/hle/service/usb/usb.cpp +++ b/src/core/hle/service/usb/usb.cpp @@ -19,7 +19,7 @@ class IDsInterface final : public ServiceFramework { public: explicit IDsInterface(Core::System& system_) : ServiceFramework{system_, "IDsInterface"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "AddEndpoint"}, FunctionInfo{1, nullptr, "GetSetupEvent"}, FunctionInfo{2, nullptr, "GetSetupPacket"}, @@ -43,7 +43,7 @@ class IDsRootSession final : public ServiceFramework { public: explicit IDsRootSession(Core::System& system_) : ServiceFramework{system_, "usb:ds"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenDsService"} ); FunctionInfoBase const* FindRequest(u32 key) override { @@ -56,7 +56,7 @@ public: explicit IClientEpSession(Core::System& system_) : ServiceFramework{system_, "IClientEpSession"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ReOpen"}, FunctionInfo{1, nullptr, "Close"}, FunctionInfo{2, nullptr, "GetCompletionEvent"}, @@ -77,7 +77,7 @@ public: explicit IClientIfSession(Core::System& system_) : ServiceFramework{system_, "IClientIfSession"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetStateChangeEvent"}, FunctionInfo{1, nullptr, "SetInterface"}, FunctionInfo{2, nullptr, "GetInterface"}, @@ -98,7 +98,7 @@ class IClientRootSession final : public ServiceFramework { public: explicit IClientRootSession(Core::System& system_) : ServiceFramework{system_, "usb:hs"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "BindClientProcess"}, FunctionInfo{1, nullptr, "QueryAllInterfaces"}, FunctionInfo{2, nullptr, "QueryAvailableInterfaces"}, @@ -118,7 +118,7 @@ class IPdSession final : public ServiceFramework { public: explicit IPdSession(Core::System& system_) : ServiceFramework{system_, "IPdSession"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "BindNoticeEvent"}, FunctionInfo{1, nullptr, "UnbindNoticeEvent"}, FunctionInfo{2, nullptr, "GetStatus"}, @@ -149,7 +149,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IPdManager::OpenSession, "OpenSession"} ); }; @@ -159,7 +159,7 @@ public: explicit IPdCradleSession(Core::System& system_) : ServiceFramework{system_, "IPdCradleSession"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "SetCradleVdo"}, FunctionInfo{1, nullptr, "GetCradleVdo"}, FunctionInfo{2, nullptr, "ResetCradleUsbHub"}, @@ -192,7 +192,7 @@ private: rb.PushIpcInterface(ctx, system); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, &IPdCradleManager::OpenCradleSession, "OpenCradleSession"} ); }; @@ -201,7 +201,7 @@ class IPmMainService final : public ServiceFramework { public: explicit IPmMainService(Core::System& system_) : ServiceFramework{system_, "usb:pm"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetPowerEvent"}, FunctionInfo{1, nullptr, "GetPowerState"}, FunctionInfo{2, nullptr, "GetDataEvent"}, @@ -218,7 +218,7 @@ class IPdManufactureManager final : public ServiceFramework { public: explicit IQdbManager(Core::System& system_) : ServiceFramework{system_, "usb:qdb"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "ImportQuirkDevices"}, FunctionInfo{1, nullptr, "HasQuirk"} ); @@ -243,7 +243,7 @@ class IPmObserverService final : public ServiceFramework { public: explicit IPmObserverService(Core::System& system_) : ServiceFramework{system_, "usb:obsv"} {} - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetTopologyChangeEvent"}, FunctionInfo{1, nullptr, "GetFlattenedTopology"} ); diff --git a/src/core/hle/service/vi/application_display_service.cpp b/src/core/hle/service/vi/application_display_service.cpp index 432042a8a9..88030d66b4 100644 --- a/src/core/hle/service/vi/application_display_service.cpp +++ b/src/core/hle/service/vi/application_display_service.cpp @@ -18,7 +18,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* IApplicationDisplayService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{100, C<&IApplicationDisplayService::GetRelayService>, "GetRelayService"}, FunctionInfo{101, C<&IApplicationDisplayService::GetSystemDisplayService>, "GetSystemDisplayService"}, FunctionInfo{102, C<&IApplicationDisplayService::GetManagerDisplayService>, "GetManagerDisplayService"}, diff --git a/src/core/hle/service/vi/application_root_service.cpp b/src/core/hle/service/vi/application_root_service.cpp index 0dd7019da9..9a4c5c8d42 100644 --- a/src/core/hle/service/vi/application_root_service.cpp +++ b/src/core/hle/service/vi/application_root_service.cpp @@ -15,7 +15,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* IApplicationRootService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, C<&IApplicationRootService::GetDisplayService>, "GetDisplayService"}, FunctionInfo{1, nullptr, "GetDisplayServiceWithProxyNameExchange"} ); diff --git a/src/core/hle/service/vi/manager_display_service.cpp b/src/core/hle/service/vi/manager_display_service.cpp index 12be9754f3..189e897a3d 100644 --- a/src/core/hle/service/vi/manager_display_service.cpp +++ b/src/core/hle/service/vi/manager_display_service.cpp @@ -11,7 +11,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* IManagerDisplayService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{200, nullptr, "AllocateProcessHeapBlock"}, FunctionInfo{201, nullptr, "FreeProcessHeapBlock"}, FunctionInfo{1102, nullptr, "GetDisplayResolution"}, diff --git a/src/core/hle/service/vi/manager_root_service.cpp b/src/core/hle/service/vi/manager_root_service.cpp index f57bb8ea1d..8ab0e25845 100644 --- a/src/core/hle/service/vi/manager_root_service.cpp +++ b/src/core/hle/service/vi/manager_root_service.cpp @@ -16,7 +16,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* IManagerRootService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{2, C<&IManagerRootService::GetDisplayService>, "GetDisplayService"}, FunctionInfo{3, nullptr, "GetDisplayServiceWithProxyNameExchange"}, FunctionInfo{100, nullptr, "PrepareFatal"}, diff --git a/src/core/hle/service/vi/system_display_service.cpp b/src/core/hle/service/vi/system_display_service.cpp index 09ee1b55dd..a996084119 100644 --- a/src/core/hle/service/vi/system_display_service.cpp +++ b/src/core/hle/service/vi/system_display_service.cpp @@ -13,7 +13,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* ISystemDisplayService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1200, nullptr, "GetZOrderCountMin"}, FunctionInfo{1202, nullptr, "GetZOrderCountMax"}, FunctionInfo{1203, nullptr, "GetDisplayLogicalResolution"}, diff --git a/src/core/hle/service/vi/system_root_service.cpp b/src/core/hle/service/vi/system_root_service.cpp index 9f2c46e5c4..e3d0417792 100644 --- a/src/core/hle/service/vi/system_root_service.cpp +++ b/src/core/hle/service/vi/system_root_service.cpp @@ -15,7 +15,7 @@ namespace Service::VI { ServiceFrameworkBase::FunctionInfoBase const* ISystemRootService::FindRequest(u32 key) { - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{1, C<&ISystemRootService::GetDisplayService>, "GetDisplayService"}, FunctionInfo{3, nullptr, "GetDisplayServiceWithProxyNameExchange"} ); diff --git a/src/core/hle/service/wlan/wlan.cpp b/src/core/hle/service/wlan/wlan.cpp index e1c3f244a0..4e6e382810 100644 --- a/src/core/hle/service/wlan/wlan.cpp +++ b/src/core/hle/service/wlan/wlan.cpp @@ -21,7 +21,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "OpenMasterMode" }, FunctionInfo{0, nullptr, "OpenMode_2" }, FunctionInfo{1, nullptr, "CloseMasterMode" }, @@ -131,7 +131,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetFrameRaw" } ); }; @@ -145,7 +145,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetActionFrame" } ); }; @@ -159,7 +159,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "GetFrameRaw" } ); }; @@ -173,7 +173,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "PutFrameRaw_2" }, FunctionInfo{1, nullptr, "CancelGetFrame_2" }, FunctionInfo{2, nullptr, "CreateRxEntry_2" }, @@ -199,7 +199,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "Cmd0" }, FunctionInfo{1, nullptr, "Cmd1" }, FunctionInfo{2, nullptr, "Cmd2" }, @@ -240,7 +240,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateWirelessCommunicationService" }, FunctionInfo{1, nullptr, "CreatePrivateWirelessCommunicationService" } ); @@ -255,7 +255,7 @@ public: FunctionInfoBase const* FindRequest(u32 key) override { return HandlerTableGenerateWithFind(key, functions); } - static const auto functions = CreateStaticMap( + static constexpr auto functions = CreateStaticMap( FunctionInfo{0, nullptr, "CreateDriverService" } ); };