piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of cassert with Common/Assert.h

Browse Source
This commit is contained in:
Pokechu22
2021-04-01 14:30:01 -07:00
parent a2fa9aab5b
commit 004dfd1586
20 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
View File

@ -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)
{

4
Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp
View File

@ -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";
}
}

6
Source/Core/Core/HW/WiimoteCommon/DataReport.cpp
View File

@ -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;
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
View File

@ -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;
}
}

4
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -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;
}
}

3
Source/Core/Core/NetPlayClient.cpp
View File

@ -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;
}

1
Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
View File

@ -5,7 +5,6 @@
#include "Core/PowerPC/Interpreter/Interpreter.h"
#include <array>
#include <cassert>
#include <cinttypes>
#include <string>