Merge pull request #9906 from shuffle2/msvc-warnings

remove msvc warnings which no longer fire, and DSP::Profiler
dolphin-emu · Jul 18, 2021 · baeeea8 · baeeea8
2 parents d7a5558 + e1bddd4
commit baeeea8
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 118 deletions.
diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
@@ -11,11 +11,6 @@
 #include "Common/Random.h"
 #include "Common/StringUtil.h"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4505)
-#endif
-
 namespace Common::ec
 {
 static const u8 square[16] = {0x00, 0x01, 0x04, 0x05, 0x10, 0x11, 0x14, 0x15,
@@ -298,7 +293,4 @@ std::array<u8, 60> ComputeSharedSecret(const u8* private_key, const u8* public_k
   std::copy_n(data.Data(), shared_secret.size(), shared_secret.begin());
   return shared_secret;
 }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 }  // namespace Common::ec
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
@@ -49,11 +49,6 @@
 #include <unistd.h>  // for unlink()
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4310)
-#endif
-
 namespace Common
 {
 // Believe me, you *don't* want to change these constants !!
@@ -288,7 +283,3 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename)
   return false;
 }
 }  // namespace Common
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -163,8 +163,6 @@ add_library(core
   HW/DSPLLE/DSPHost.cpp
   HW/DSPLLE/DSPLLE.cpp
   HW/DSPLLE/DSPLLE.h
-  HW/DSPLLE/DSPLLEGlobals.cpp
-  HW/DSPLLE/DSPLLEGlobals.h
   HW/DSPLLE/DSPSymbols.cpp
   HW/DSPLLE/DSPSymbols.h
   HW/DVD/DVDInterface.cpp

diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -24,7 +24,6 @@
 #include "Core/DSP/DSPTables.h"
 #include "Core/DSP/Interpreter/DSPInterpreter.h"
 #include "Core/DSP/Jit/DSPEmitterBase.h"
-#include "Core/HW/DSPLLE/DSPLLEGlobals.h"
 #include "Core/HW/Memmap.h"
 #include "Core/Host.h"
 

diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.cpp
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h
diff --git a/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h b/Source/Core/Core/HW/WiimoteCommon/WiimoteReport.h
@@ -10,12 +10,6 @@
 #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-// Disable warning for zero-sized array:
-#pragma warning(disable : 4200)
-#endif
-
 namespace WiimoteCommon
 {
 #pragma pack(push, 1)
@@ -27,7 +21,8 @@ struct OutputReportGeneric
 
   union
   {
-    u8 data[0];
+    // Actual size varies
+    u8 data[1];
     struct
     {
       // Enable/disable rumble. (Valid for ALL output reports)
@@ -309,7 +304,3 @@ struct AccelCalibrationData
 }  // namespace WiimoteCommon
 
 #pragma pack(pop)
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -53,7 +53,7 @@ void Wiimote::InvokeHandler(H&& handler, const WiimoteCommon::OutputReportGeneri
     return;
   }
 
-  (this->*handler)(Common::BitCastPtr<T>(rpt.data));
+  (this->*handler)(Common::BitCastPtr<T>(&rpt.data[0]));
 }
 
 void Wiimote::EventLinked()

diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
@@ -246,7 +246,6 @@
     <ClInclude Include="Core\HW\DSPHLE\UCodes\Zelda.h" />
     <ClInclude Include="Core\HW\DSPLLE\DSPDebugInterface.h" />
     <ClInclude Include="Core\HW\DSPLLE\DSPLLE.h" />
-    <ClInclude Include="Core\HW\DSPLLE\DSPLLEGlobals.h" />
     <ClInclude Include="Core\HW\DSPLLE\DSPSymbols.h" />
     <ClInclude Include="Core\HW\DVD\DVDInterface.h" />
     <ClInclude Include="Core\HW\DVD\DVDMath.h" />
@@ -825,7 +824,6 @@
     <ClCompile Include="Core\HW\DSPHLE\UCodes\Zelda.cpp" />
     <ClCompile Include="Core\HW\DSPLLE\DSPHost.cpp" />
     <ClCompile Include="Core\HW\DSPLLE\DSPLLE.cpp" />
-    <ClCompile Include="Core\HW\DSPLLE\DSPLLEGlobals.cpp" />
     <ClCompile Include="Core\HW\DSPLLE\DSPSymbols.cpp" />
     <ClCompile Include="Core\HW\DVD\DVDInterface.cpp" />
     <ClCompile Include="Core\HW\DVD\DVDMath.cpp" />