Merge pull request #4914 from Rastaban/master

C++ conformance fixes (MSVC /permissive-)

Source/Core/AudioCommon/XAudio2Stream.cpp

@@ -28,8 +28,8 @@ public:
 
   ~StreamingVoiceContext();
 
-  void StreamingVoiceContext::Stop();
-  void StreamingVoiceContext::Play();
+  void Stop();
+  void Play();
 
   STDMETHOD_(void, OnVoiceError)(THIS_ void* pBufferContext, HRESULT Error) {}
   STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32) {}

Source/Core/AudioCommon/XAudio2_7Stream.cpp

@@ -28,8 +28,8 @@ public:
 
   ~StreamingVoiceContext2_7();
 
-  void StreamingVoiceContext2_7::Stop();
-  void StreamingVoiceContext2_7::Play();
+  void Stop();
+  void Play();
 
   STDMETHOD_(void, OnVoiceError)(THIS_ void* pBufferContext, HRESULT Error) {}
   STDMETHOD_(void, OnVoiceProcessingPassStart)(UINT32) {}

Source/Core/Common/MathUtil.h

@@ -24,6 +24,8 @@ constexpr T SNANConstant()
 // will use __builtin_nans, which is improperly handled by the compiler and generates
 // a bad constant. Here we go back to the version MSVC used before the builtin.
 // TODO: Remove this and use numeric_limits directly whenever this bug is fixed.
+#include <intrin.h>
+
 template <>
 constexpr double SNANConstant()
 {

Source/Core/Core/HW/WiimoteReal/IOWin.cpp

@@ -187,7 +187,7 @@ int IOWrite(HANDLE& dev_handle, OVERLAPPED& hid_overlap_write, enum WinWriteMeth
 int IORead(HANDLE& dev_handle, OVERLAPPED& hid_overlap_read, u8* buf, int index);
 
 template <typename T>
-void ProcessWiimotes(bool new_scan, T& callback);
+void ProcessWiimotes(bool new_scan, const T& callback);
 
 bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO&, BLUETOOTH_DEVICE_INFO_STRUCT&);
 void RemoveWiimote(BLUETOOTH_DEVICE_INFO_STRUCT&);
@@ -795,7 +795,7 @@ int WiimoteWindows::IOWrite(const u8* buf, size_t len)
 
 // invokes callback for each found Wiimote Bluetooth device
 template <typename T>
-void ProcessWiimotes(bool new_scan, T& callback)
+void ProcessWiimotes(bool new_scan, const T& callback)
 {
   BLUETOOTH_DEVICE_SEARCH_PARAMS srch;
   srch.dwSize = sizeof(srch);

Source/Core/DolphinWX/Config/PathConfigPane.cpp

@@ -187,7 +187,8 @@ void PathConfigPane::OnRemoveISOPath(wxCommandEvent& event)
 
 // This seems to not be activated on Windows when it should be. wxw bug?
 #ifdef _WIN32
-  OnISOPathSelectionChanged(wxCommandEvent());
+  wxCommandEvent dummy_event{};
+  OnISOPathSelectionChanged(dummy_event);
 #endif
 
   SaveISOPathChanges();

Source/Core/VideoBackends/D3D/GeometryShaderCache.h

@@ -21,8 +21,8 @@ public:
   static bool InsertByteCode(const GeometryShaderUid& uid, const void* bytecode,
                              unsigned int bytecodelen);
 
-  static ID3D11GeometryShader* GeometryShaderCache::GetClearGeometryShader();
-  static ID3D11GeometryShader* GeometryShaderCache::GetCopyGeometryShader();
+  static ID3D11GeometryShader* GetClearGeometryShader();
+  static ID3D11GeometryShader* GetCopyGeometryShader();
 
   static ID3D11GeometryShader* GetActiveShader() { return last_entry->shader; }
   static ID3D11Buffer*& GetConstantBuffer();

Source/Core/VideoBackends/D3D/VertexShaderCache.h

@@ -30,7 +30,7 @@ public:
   static ID3D11InputLayout* GetSimpleInputLayout();
   static ID3D11InputLayout* GetClearInputLayout();
 
-  static bool VertexShaderCache::InsertByteCode(const VertexShaderUid& uid, D3DBlob* bcodeblob);
+  static bool InsertByteCode(const VertexShaderUid& uid, D3DBlob* bcodeblob);
 
 private:
   struct VSCacheEntry

Source/Core/VideoBackends/D3D12/TextureCache.cpp

@@ -499,7 +499,7 @@ void TextureCache::ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* uncon
   g_renderer->RestoreAPIState();
 }
 
-D3D12_SHADER_BYTECODE GetConvertShader12(std::string& Type)
+D3D12_SHADER_BYTECODE GetConvertShader12(const std::string& Type)
 {
   std::string shader = "#define DECODE DecodePixel_";
   shader.append(Type);