diff --git a/pcsx2/Config.h b/pcsx2/Config.h index e292c15a85..1f82c7b237 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -1170,10 +1170,7 @@ struct Pcsx2Config // ------------------------------------------------------------------------ struct USBOptions { - enum : u32 - { - NUM_PORTS = 2 - }; + static constexpr u32 NUM_PORTS = 2; struct Port { diff --git a/pcsx2/GS/Renderers/OpenGL/GLShaderCache.cpp b/pcsx2/GS/Renderers/OpenGL/GLShaderCache.cpp index 9f6b49ead9..e0c5bef53a 100644 --- a/pcsx2/GS/Renderers/OpenGL/GLShaderCache.cpp +++ b/pcsx2/GS/Renderers/OpenGL/GLShaderCache.cpp @@ -28,6 +28,7 @@ #include "common/StringUtil.h" #include "common/Timer.h" +namespace { #pragma pack(push, 1) struct CacheIndexEntry { @@ -42,6 +43,7 @@ struct CacheIndexEntry u32 blob_format; }; #pragma pack(pop) +} GLShaderCache::GLShaderCache() = default; diff --git a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp index 6053c24cf2..34b02e547a 100644 --- a/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp +++ b/pcsx2/GS/Renderers/Vulkan/VKShaderCache.cpp @@ -44,6 +44,7 @@ std::unique_ptr g_vulkan_shader_cache; +namespace { #pragma pack(push, 4) struct VK_PIPELINE_CACHE_HEADER { @@ -64,6 +65,7 @@ struct CacheIndexEntry u32 blob_size; }; #pragma pack(pop) +} static bool ValidatePipelineCacheHeader(const VK_PIPELINE_CACHE_HEADER& header) { diff --git a/pcsx2/USB/usb-printer/usb-printer.cpp b/pcsx2/USB/usb-printer/usb-printer.cpp index 74c1b950b8..4b8a50659a 100644 --- a/pcsx2/USB/usb-printer/usb-printer.cpp +++ b/pcsx2/USB/usb-printer/usb-printer.cpp @@ -29,6 +29,10 @@ namespace usb_printer { + static const char* sPrinterNames[] = { + "Sony DPP-MP1", + }; + typedef struct PrinterState { USBDevice dev{}; diff --git a/pcsx2/USB/usb-printer/usb-printer.h b/pcsx2/USB/usb-printer/usb-printer.h index 9cb5d839be..5d8ab3d8c7 100644 --- a/pcsx2/USB/usb-printer/usb-printer.h +++ b/pcsx2/USB/usb-printer/usb-printer.h @@ -120,10 +120,6 @@ namespace usb_printer }, }; - static const char* sPrinterNames[] = { - "Sony DPP-MP1", - }; - class PrinterDevice final : public DeviceProxy { public: