summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-20 17:27:48 -0400
committerLioncash <mathew1800@gmail.com>2018-08-20 19:48:57 -0400
commit69dd37d874094a2ad632e5dbafaa16553703af73 (patch)
tree8290bb073898ea80d62459dc2cd632091fd7b4fc /src
parentf13a66b963d4ecd53dda7866e947bc3230566d63 (diff)
profile_manager: Simplify UUID's two param constructor, operator==, and operator bool
We can use the constructor initializer list and just compare the contained u128's together instead of comparing each element individually. Ditto for comparing against an invalid UUID.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/acc/profile_manager.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index 91f6f03a9..054dd864e 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -21,16 +21,14 @@ struct UUID {
u128 uuid = INVALID_UUID;
UUID() = default;
explicit UUID(const u128& id) : uuid{id} {}
- explicit UUID(const u64 lo, const u64 hi) {
- uuid[0] = lo;
- uuid[1] = hi;
- };
+ explicit UUID(const u64 lo, const u64 hi) : uuid{{lo, hi}} {}
+
explicit operator bool() const {
- return uuid[0] != INVALID_UUID[0] || uuid[1] != INVALID_UUID[1];
+ return uuid != INVALID_UUID;
}
bool operator==(const UUID& rhs) const {
- return std::tie(uuid[0], uuid[1]) == std::tie(rhs.uuid[0], rhs.uuid[1]);
+ return uuid == rhs.uuid;
}
bool operator!=(const UUID& rhs) const {