From 7123fcd19b9244e823dd3c0a259c0ef9a7a78e1c Mon Sep 17 00:00:00 2001 From: "Dr. Dystopia" Date: Sat, 19 Apr 2025 17:43:18 +0200 Subject: [PATCH] DiscIO: Use `= default` to define a trivial destructor --- Source/Core/DiscIO/Blob.cpp | 4 +--- Source/Core/DiscIO/Blob.h | 2 +- Source/Core/DiscIO/CompressedBlob.cpp | 4 +--- Source/Core/DiscIO/VolumeGC.cpp | 4 +--- Source/Core/DiscIO/VolumeWii.cpp | 4 +--- Source/Core/DiscIO/WbfsBlob.cpp | 4 +--- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp index 96e4640dfd..9e1ddb9ead 100644 --- a/Source/Core/DiscIO/Blob.cpp +++ b/Source/Core/DiscIO/Blob.cpp @@ -78,9 +78,7 @@ void SectorReader::SetChunkSize(int block_cnt) SetSectorSize(m_block_size); } -SectorReader::~SectorReader() -{ -} +SectorReader::~SectorReader() = default; const SectorReader::Cache* SectorReader::FindCacheLine(u64 block_num) { diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h index 29f6fb5b3f..eec2cb8938 100644 --- a/Source/Core/DiscIO/Blob.h +++ b/Source/Core/DiscIO/Blob.h @@ -61,7 +61,7 @@ std::string GetName(BlobType blob_type, bool translate); class BlobReader { public: - virtual ~BlobReader() {} + virtual ~BlobReader() = default; virtual BlobType GetBlobType() const = 0; virtual std::unique_ptr CopyReader() const = 0; diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index fccb3928d1..a35e523e37 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -70,9 +70,7 @@ std::unique_ptr CompressedBlobReader::Create(File::IOFile return nullptr; } -CompressedBlobReader::~CompressedBlobReader() -{ -} +CompressedBlobReader::~CompressedBlobReader() = default; std::unique_ptr CompressedBlobReader::CopyReader() const { diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 1517207f95..8a95e0bb31 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -41,9 +41,7 @@ VolumeGC::VolumeGC(std::unique_ptr reader) : m_reader(std::move(read m_converted_banner = [this] { return LoadBannerFile(); }; } -VolumeGC::~VolumeGC() -{ -} +VolumeGC::~VolumeGC() = default; bool VolumeGC::Read(u64 offset, u64 length, u8* buffer, const Partition& partition) const { diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index eca23fb4f9..764dabe543 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -159,9 +159,7 @@ VolumeWii::VolumeWii(std::unique_ptr reader) } } -VolumeWii::~VolumeWii() -{ -} +VolumeWii::~VolumeWii() = default; bool VolumeWii::Read(u64 offset, u64 length, u8* buffer, const Partition& partition) const { diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp index d61799a77a..a9fba96212 100644 --- a/Source/Core/DiscIO/WbfsBlob.cpp +++ b/Source/Core/DiscIO/WbfsBlob.cpp @@ -44,9 +44,7 @@ WbfsFileReader::WbfsFileReader(File::IOFile file, const std::string& path) m_wlba_table[i] = Common::swap16(m_wlba_table[i]); } -WbfsFileReader::~WbfsFileReader() -{ -} +WbfsFileReader::~WbfsFileReader() = default; std::unique_ptr WbfsFileReader::CopyReader() const {