Merge pull request #9621 from Pokechu22/cassert

Replace uses of cassert with Common/Assert.h
dolphin-emu · Apr 3, 2021 · 6d1eb6a · 6d1eb6a
2 parents 5513d5f + 004dfd1
commit 6d1eb6a
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 63 deletions.
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -5,7 +5,6 @@
 #ifdef ANDROID
 #include "AudioCommon/OpenSLESStream.h"
 
-#include <cassert>
 #include <cmath>
 
 #include <SLES/OpenSLES.h>
@@ -36,8 +35,8 @@ static int curBuffer = 0;
 
 static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context)
 {
-  assert(bq == bqPlayerBufferQueue);
-  assert(nullptr == context);
+  ASSERT(bq == bqPlayerBufferQueue);
+  ASSERT(nullptr == context);
 
   // Render to the fresh buffer
   g_mixer->Mix(reinterpret_cast<short*>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES);
@@ -56,15 +55,15 @@ bool OpenSLESStream::Init()
   SLresult result;
   // create engine
   result = slCreateEngine(&engineObject, 0, nullptr, 0, nullptr, nullptr);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*engineObject)->Realize(engineObject, SL_BOOLEAN_FALSE);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*engineObject)->GetInterface(engineObject, SL_IID_ENGINE, &engineEngine);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*engineEngine)->CreateOutputMix(engineEngine, &outputMixObject, 0, 0, 0);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*outputMixObject)->Realize(outputMixObject, SL_BOOLEAN_FALSE);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
 
   SLDataLocator_AndroidSimpleBufferQueue loc_bufq = {SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, 2};
   SLDataFormat_PCM format_pcm = {SL_DATAFORMAT_PCM,
@@ -87,21 +86,21 @@ bool OpenSLESStream::Init()
   result =
       (*engineEngine)
           ->CreateAudioPlayer(engineEngine, &bqPlayerObject, &audioSrc, &audioSnk, 2, ids, req);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
 
   result = (*bqPlayerObject)->Realize(bqPlayerObject, SL_BOOLEAN_FALSE);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_PLAY, &bqPlayerPlay);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result =
       (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_BUFFERQUEUE, &bqPlayerBufferQueue);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*bqPlayerObject)->GetInterface(bqPlayerObject, SL_IID_VOLUME, &bqPlayerVolume);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*bqPlayerBufferQueue)->RegisterCallback(bqPlayerBufferQueue, bqPlayerCallback, nullptr);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
   result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
-  assert(SL_RESULT_SUCCESS == result);
+  ASSERT(SL_RESULT_SUCCESS == result);
 
   // Render and enqueue a first buffer.
   curBuffer ^= 1;

diff --git a/Source/Core/AudioCommon/PulseAudioStream.cpp b/Source/Core/AudioCommon/PulseAudioStream.cpp
@@ -5,6 +5,8 @@
 #include <cstring>
 
 #include "AudioCommon/PulseAudioStream.h"
+
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"
@@ -104,7 +106,7 @@ bool PulseAudio::PulseInit()
   }
   ss.channels = m_channels;
   ss.rate = m_mixer->GetSampleRate();
-  assert(pa_sample_spec_valid(&ss));
+  ASSERT(pa_sample_spec_valid(&ss));
   m_pa_s = pa_stream_new(m_pa_ctx, "Playback", &ss, channel_map_p);
   pa_stream_set_write_callback(m_pa_s, WriteCallback, this);
   pa_stream_set_underflow_callback(m_pa_s, UnderflowCallback, this);

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
@@ -5,12 +5,12 @@
 #include "Core/HW/GCMemcard/GCMemcard.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cinttypes>
 #include <cstring>
 #include <utility>
 #include <vector>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/ColorUtil.h"
 #include "Common/CommonFuncs.h"
@@ -240,7 +240,7 @@ std::pair<GCMemcardErrorCode, std::optional<GCMemcard>> GCMemcard::Open(std::str
     else
     {
       // should never reach here
-      assert(0);
+      ASSERT(false);
     }
   }
 
@@ -329,7 +329,7 @@ bool GCMemcard::Save()
 
 static std::pair<u16, u16> CalculateMemcardChecksums(const u8* data, size_t size)
 {
-  assert(size % 2 == 0);
+  ASSERT(size % 2 == 0);
   u16 csum = 0;
   u16 inv_csum = 0;
 
@@ -779,7 +779,7 @@ GCMemcardErrorCode BlockAlloc::CheckForErrors(u16 size_mbits) const
   {
     // check if free block count matches the actual amount of free blocks in m_map
     const u16 total_available_blocks = (size_mbits * MBIT_TO_BLOCKS) - MC_FST_BLOCKS;
-    assert(total_available_blocks <= m_map.size());
+    ASSERT(total_available_blocks <= m_map.size());
     u16 blocks_in_use = 0;
     for (size_t i = 0; i < total_available_blocks; ++i)
     {

diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp
@@ -1,10 +1,10 @@
 #include "Core/HW/GCMemcard/GCMemcardUtils.h"
 
 #include <array>
-#include <cassert>
 #include <string>
 #include <vector>
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/IOFile.h"
 #include "Common/NandPaths.h"
@@ -330,7 +330,7 @@ std::string GetDefaultExtension(SavefileFormat format)
   case SavefileFormat::SAV:
     return ".sav";
   default:
-    assert(0);
+    ASSERT(false);
     return ".gci";
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp b/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include <cassert>
+#include "Core/HW/WiimoteCommon/DataReport.h"
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/MathUtil.h"
-#include "Core/HW/WiimoteCommon/DataReport.h"
 
 namespace WiimoteCommon
 {
@@ -308,7 +308,7 @@ std::unique_ptr<DataReportManipulator> MakeDataReportManipulator(InputReportID r
     ptr = std::make_unique<ReportInterleave2>();
     break;
   default:
-    assert(false);
+    ASSERT(false);
     break;
   }
 

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp
@@ -5,9 +5,9 @@
 #include "Core/HW/WiimoteEmu/Extension/Classic.h"
 
 #include <array>
-#include <cassert>
 #include <string_view>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -204,7 +204,7 @@ ControllerEmu::ControlGroup* Classic::GetGroup(ClassicGroup group)
   case ClassicGroup::RightStick:
     return m_right_stick;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp
@@ -5,8 +5,8 @@
 #include "Core/HW/WiimoteEmu/Extension/DrawsomeTablet.h"
 
 #include <array>
-#include <cassert>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -101,7 +101,7 @@ ControllerEmu::ControlGroup* DrawsomeTablet::GetGroup(DrawsomeTabletGroup group)
   case DrawsomeTabletGroup::Touch:
     return m_touch;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
@@ -4,9 +4,9 @@
 
 #include "Core/HW/WiimoteEmu/Extension/Drums.h"
 
-#include <cassert>
 #include <type_traits>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -199,7 +199,7 @@ ControllerEmu::ControlGroup* Drums::GetGroup(DrumsGroup group)
   case DrumsGroup::Stick:
     return m_stick;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
@@ -5,10 +5,10 @@
 #include "Core/HW/WiimoteEmu/Extension/Guitar.h"
 
 #include <array>
-#include <cassert>
 #include <cstring>
 #include <map>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -164,7 +164,7 @@ ControllerEmu::ControlGroup* Guitar::GetGroup(GuitarGroup group)
   case GuitarGroup::SliderBar:
     return m_slider_bar;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
@@ -6,9 +6,9 @@
 
 #include <algorithm>
 #include <array>
-#include <cassert>
 #include <cstring>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -170,7 +170,7 @@ ControllerEmu::ControlGroup* Nunchuk::GetGroup(NunchukGroup group)
   case NunchukGroup::IMUAccelerometer:
     return m_imu_accelerometer;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
@@ -5,9 +5,9 @@
 #include "Core/HW/WiimoteEmu/Extension/TaTaCon.h"
 
 #include <array>
-#include <cassert>
 #include <cstring>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -80,7 +80,7 @@ ControllerEmu::ControlGroup* TaTaCon::GetGroup(TaTaConGroup group)
   case TaTaConGroup::Rim:
     return m_rim;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
@@ -5,9 +5,9 @@
 #include "Core/HW/WiimoteEmu/Extension/Turntable.h"
 
 #include <array>
-#include <cassert>
 #include <cstring>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -163,7 +163,7 @@ ControllerEmu::ControlGroup* Turntable::GetGroup(TurntableGroup group)
   case TurntableGroup::Crossfade:
     return m_crossfade;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
@@ -5,8 +5,8 @@
 #include "Core/HW/WiimoteEmu/Extension/UDrawTablet.h"
 
 #include <array>
-#include <cassert>
 
+#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
@@ -130,7 +130,7 @@ ControllerEmu::ControlGroup* UDrawTablet::GetGroup(UDrawTabletGroup group)
   case UDrawTabletGroup::Touch:
     return m_touch;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -5,12 +5,12 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 #include <algorithm>
-#include <cassert>
 #include <memory>
 #include <string_view>
 
 #include <fmt/format.h>
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
@@ -338,7 +338,7 @@ ControllerEmu::ControlGroup* Wiimote::GetWiimoteGroup(WiimoteGroup group) const
   case WiimoteGroup::IMUPoint:
     return m_imu_ir;
   default:
-    assert(false);
+    ASSERT(false);
     return nullptr;
   }
 }

diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
@@ -5,7 +5,6 @@
 #include "Core/NetPlayClient.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstddef>
 #include <cstring>
 #include <fstream>
@@ -2026,7 +2025,7 @@ bool NetPlayClient::WiimoteUpdate(int _number, u8* data, const std::size_t size,
     }
   }
 
-  assert(nw.data.size() == size);
+  ASSERT(nw.data.size() == size);
   std::copy(nw.data.begin(), nw.data.end(), data);
   return true;
 }

diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
@@ -5,7 +5,6 @@
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 
 #include <array>
-#include <cassert>
 #include <cinttypes>
 #include <string>