diff options
| author | Tilka <tilkax@gmail.com> | 2024-08-21 01:52:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 01:52:16 +0100 |
| commit | 7b8b733b11b18875cb702615dfabb852db024d52 (patch) | |
| tree | aac1bcc5de72be1637b5f64e3d39a73df8d9d450 /Source/Core/DiscIO | |
| parent | 44f1a7586565307155b329d911a57fbf65785a57 (diff) | |
| parent | 9602f36248edec803275128a0a327e3355f9472d (diff) | |
Merge pull request #13022 from tygyh/Remove-redundant-semicolons
Remove redundant semicolons
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/CompressedBlob.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/RiivolutionParser.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DiscIO/WIABlob.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/DiscIO/WIACompression.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 629cedfe7c..ce1e210b77 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -272,7 +272,7 @@ static ConversionResultCode Output(OutputParameters parameters, File::IOFile* ou } return ConversionResultCode::Success; -}; +} bool ConvertToGCZ(BlobReader* infile, const std::string& infile_path, const std::string& outfile_path, u32 sub_type, int block_size, diff --git a/Source/Core/DiscIO/RiivolutionParser.cpp b/Source/Core/DiscIO/RiivolutionParser.cpp index 656cd20697..f120335f56 100644 --- a/Source/Core/DiscIO/RiivolutionParser.cpp +++ b/Source/Core/DiscIO/RiivolutionParser.cpp @@ -67,7 +67,7 @@ static std::vector<u8> ReadHexString(std::string_view sv) sv = sv.substr(2); } return result; -}; +} std::optional<Disc> ParseString(std::string_view xml, std::string xml_path) { diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index a9496fe5a0..92bab36d81 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -1120,27 +1120,27 @@ bool WIARVZFileReader<RVZ>::TryReuse(std::map<ReuseID, GroupEntry>* reusable_gro static bool AllAre(const std::vector<u8>& data, u8 x) { return std::all_of(data.begin(), data.end(), [x](u8 y) { return x == y; }); -}; +} static bool AllAre(const u8* begin, const u8* end, u8 x) { return std::all_of(begin, end, [x](u8 y) { return x == y; }); -}; +} static bool AllZero(const std::vector<u8>& data) { return AllAre(data, 0); -}; +} static bool AllSame(const std::vector<u8>& data) { return AllAre(data, data.front()); -}; +} static bool AllSame(const u8* begin, const u8* end) { return AllAre(begin, end, *begin); -}; +} template <typename OutputParametersEntry> static void RVZPack(const u8* in, OutputParametersEntry* out, u64 bytes_per_chunk, size_t chunks, diff --git a/Source/Core/DiscIO/WIACompression.h b/Source/Core/DiscIO/WIACompression.h index d3d5cb34d7..42f4a7fa19 100644 --- a/Source/Core/DiscIO/WIACompression.h +++ b/Source/Core/DiscIO/WIACompression.h @@ -38,7 +38,7 @@ public: virtual bool Decompress(const DecompressionBuffer& in, DecompressionBuffer* out, size_t* in_bytes_read) = 0; - virtual bool Done() const { return m_done; }; + virtual bool Done() const { return m_done; } protected: bool m_done = false; |
