ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8287 from lioncash/static-ctor 

DiscIO/Volume: Make Partition's interface constexpr
This commit is contained in:
JosJuice 2019-08-03 10:07:53 +02:00 committed by GitHub
parent 7afba6776f db3b31c246
commit 2770707587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DiscIO/Volume.h
View File

@ -26,18 +26,18 @@ class VolumeWAD;
struct Partition final struct Partition final
{ {
Partition() : offset(std::numeric_limits<u64>::max()) {} constexpr Partition() = default;
explicit Partition(u64 offset_) : offset(offset_) {} constexpr explicit Partition(u64 offset_) : offset(offset_) {}
bool operator==(const Partition& other) const { return offset == other.offset; } constexpr bool operator==(const Partition& other) const { return offset == other.offset; }
bool operator!=(const Partition& other) const { return !(*this == other); } constexpr bool operator!=(const Partition& other) const { return !(*this == other); }
bool operator<(const Partition& other) const { return offset < other.offset; } constexpr bool operator<(const Partition& other) const { return offset < other.offset; }
bool operator>(const Partition& other) const { return other < *this; } constexpr bool operator>(const Partition& other) const { return other < *this; }
bool operator<=(const Partition& other) const { return !(*this < other); } constexpr bool operator<=(const Partition& other) const { return !(*this < other); }
bool operator>=(const Partition& other) const { return !(*this > other); } constexpr bool operator>=(const Partition& other) const { return !(*this > other); }
u64 offset; u64 offset{std::numeric_limits<u64>::max()};
}; };
const Partition PARTITION_NONE(std::numeric_limits<u64>::max() - 1); constexpr Partition PARTITION_NONE(std::numeric_limits<u64>::max() - 1);
class Volume class Volume
{ {