Add casts to resolve warnings about adding enums of different types

These should not be permanent; the whole addition thing here is messy anyways
dolphin-emu · Feb 24, 2020 · 4052563 · 4052563
1 parent 7e2fa02
commit 4052563
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
@@ -109,7 +109,8 @@ static bool s_bPolled = false;
 
 // s_InputDisplay is used by both CPU and GPU (is mutable).
 static std::mutex s_input_display_lock;
-static std::array<std::string, SerialInterface::MAX_SI_CHANNELS + MAX_BBMOTES> s_InputDisplay;
+static std::array<std::string, static_cast<size_t>(SerialInterface::MAX_SI_CHANNELS) + MAX_BBMOTES>
+    s_InputDisplay;
 
 static GCManipFunction s_gc_manip_func;
 static WiiManipFunction s_wii_manip_func;
@@ -869,7 +870,8 @@ void ReadHeader()
 {
   s_controllers = tmpHeader.controllers;
   if (tmpHeader.bBalanceBoard)
-    s_controllers |= 1 << (SerialInterface::MAX_SI_CHANNELS + WIIMOTE_BALANCE_BOARD);
+    s_controllers |=
+        1 << (static_cast<size_t>(SerialInterface::MAX_SI_CHANNELS) + WIIMOTE_BALANCE_BOARD);
   s_recordingStartTime = tmpHeader.recordingStartTime;
   if (s_rerecords < tmpHeader.numRerecords)
     s_rerecords = tmpHeader.numRerecords;
@@ -1326,7 +1328,8 @@ void SaveRecording(const std::string& filename)
   header.bFollowBranch = SConfig::GetInstance().bJITFollowBranch;
   header.controllers = s_controllers & (SConfig::GetInstance().bWii ? 0xFF : 0x0F);
   header.bBalanceBoard =
-      (s_controllers & (1 << (SerialInterface::MAX_SI_CHANNELS + WIIMOTE_BALANCE_BOARD))) != 0;
+      (s_controllers &
+       (1 << (static_cast<size_t>(SerialInterface::MAX_SI_CHANNELS) + WIIMOTE_BALANCE_BOARD))) != 0;
 
   header.bFromSaveState = s_bRecordingFromSaveState;
   header.frameCount = s_totalFrames;