2026-09-26 11:25:53

Signed-off-by: lizzie <lizzie@eden-emu.dev>

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"},

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<DAUTH_O> {
 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> module_, std::shared_ptr<ProfileManager> 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> module_, std::shared_ptr<ProfileManager> 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> module_, std::shared_ptr<ProfileManager> 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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

src/core/hle/service/am/service/library_applet_accessor.cpp

@@ -46,7 +46,7 @@ static void ReplaceEmptyUuidWithCurrentUser(const std::shared_ptr<LibraryAppletS
 }
 
     ServiceFrameworkBase::FunctionInfoBase const* ILibraryAppletAccessor::FindRequest(u32 key) {
-        static const auto functions = CreateStaticMap(
+        static constexpr auto functions = CreateStaticMap(
             FunctionInfo{0, D<&ILibraryAppletAccessor::GetAppletStateChangedEvent>, "GetAppletStateChangedEvent"},
             FunctionInfo{1, D<&ILibraryAppletAccessor::IsCompleted>, "IsCompleted"},
             FunctionInfo{10, D<&ILibraryAppletAccessor::Start>, "Start"},

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"},

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"},

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"},

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"}
     );

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<BufferAttr_HipcAutoSelect> 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"}
     );

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"},

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"},

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"},

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"}

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"},

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"}
         );

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"}
     );
 };

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"}
     );

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"},

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"},

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"},

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"}

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"},

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"}
     );

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"}

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

src/core/hle/service/bcat/news/news_data_service.cpp

@@ -25,7 +25,7 @@ std::string_view ToStringView(std::span<const char> 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"},

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"},

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"},

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

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"},

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"},

src/core/hle/service/bpc/bpc.cpp

@@ -16,7 +16,7 @@ class BPC final : public ServiceFramework<BPC> {
 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<BPC_R> {
 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<BPC_C> {
 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<BPC_B> {
 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<BPC_W> {
 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<BPC_AMS> {
 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"}
         );

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"},

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<IBtm> {
 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"},

src/core/hle/service/caps/caps.cpp

@@ -22,7 +22,7 @@ class IDecoderControlService final : public ServiceFramework<IDecoderControlServ
 public:
     explicit IDecoderControlService(Core::System& system_) : ServiceFramework{system_, "grc:d"} {}
 
-    static const auto functions = CreateStaticMap(
+    static constexpr auto functions = CreateStaticMap(
             FunctionInfo{3001, nullptr, "DecodeJpeg"},
             FunctionInfo{4001, nullptr, "ShrinkJpeg"},
             FunctionInfo{4002, nullptr, "ShrinkJpegEx"}

src/core/hle/service/caps/caps_a.cpp

@@ -14,7 +14,7 @@
 namespace Service::Capture {
 
 ServiceFrameworkBase::FunctionInfoBase const* IAlbumAccessorService::FindRequest(u32 key) {
-    static const auto functions = CreateStaticMap(
+    static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, nullptr, "GetAlbumFileCount"},
         FunctionInfo{1, C<&IAlbumAccessorService::GetAlbumFileList>, "GetAlbumFileList"},
         FunctionInfo{2, nullptr, "LoadAlbumFile"},

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"},

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"},

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"},

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"},

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"},

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"}

src/core/hle/service/es/es.cpp

@@ -221,7 +221,7 @@ private:
         rb.Push<u64>(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"},

src/core/hle/service/eupld/eupld.cpp

@@ -16,7 +16,7 @@ class ErrorUploadContext final : public ServiceFramework<ErrorUploadContext> {
 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<ErrorUploadRequest> {
 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"},

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"}

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<IRequest>(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"}

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"}
     );

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"},

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"},

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"}
     );

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<SaveDataController> save_data_controller;

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"},

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"}

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"},

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"},

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"},

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"}

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"}

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"}

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"},

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"}
     );
 };

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"}
     );

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;

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"},

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"},

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"}
     );
 };

src/core/hle/service/grc/grc.cpp

@@ -16,7 +16,7 @@ class GRC final : public ServiceFramework<GRC> {
 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<GRC_D> {
 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"}

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

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

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"},

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"}
     );
 

src/core/hle/service/lbl/lbl.cpp

@@ -302,7 +302,7 @@ private:
         rb.Push<u8>(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"},