From 8fbc92b0e072875d340acada60518de666a38093 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 28 Jun 2020 00:18:52 -0400
Subject: [PATCH] CSavedStateID: Make use of std::array

---
 src/Core/Resource/CSavedStateID.h | 45 ++++++++++++++-----------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/Core/Resource/CSavedStateID.h b/src/Core/Resource/CSavedStateID.h
index 5082e64f..453f1b54 100644
--- a/src/Core/Resource/CSavedStateID.h
+++ b/src/Core/Resource/CSavedStateID.h
@@ -2,46 +2,39 @@
 #define CSAVEDSTATEID_H
 
 #include <Common/Common.h>
+#include <array>
 
 // GUID representing a value stored in the save file for MP3/DKCR
 class CSavedStateID
 {
-    uint64 m[2];
+    std::array<uint64, 2> m{};
 
 public:
-    CSavedStateID()
+    constexpr CSavedStateID() = default;
+
+    constexpr CSavedStateID(uint64 Part1, uint64 Part2) : m{{Part1, Part2}}
     {
-        m[0] = 0;
-        m[1] = 0;
     }
 
-    CSavedStateID(uint64 Part1, uint64 Part2)
+    explicit CSavedStateID(IInputStream& rInput) : m{rInput.ReadULongLong(), rInput.ReadULongLong()}
     {
-        m[0] = Part1;
-        m[1] = Part2;
-    }
-
-    explicit CSavedStateID(IInputStream& rInput)
-    {
-        m[0] = rInput.ReadLongLong();
-        m[1] = rInput.ReadLongLong();
     }
 
     TString ToString() const
     {
-        uint32 Part1 = (m[0] >> 32) & 0xFFFFFFFF;
-        uint32 Part2 = (m[0] >> 16) & 0x0000FFFF;
-        uint32 Part3 = (m[0] >> 00) & 0x0000FFFF;
-        uint32 Part4 = (m[1] >> 48) & 0x0000FFFF;
-        uint32 Part5 = (m[1] >> 32) & 0x0000FFFF;
-        uint32 Part6 = (m[1] >> 00) & 0xFFFFFFFF;
+        const uint32 Part1 = (m[0] >> 32) & 0xFFFFFFFF;
+        const uint32 Part2 = (m[0] >> 16) & 0x0000FFFF;
+        const uint32 Part3 = (m[0] >> 00) & 0x0000FFFF;
+        const uint32 Part4 = (m[1] >> 48) & 0x0000FFFF;
+        const uint32 Part5 = (m[1] >> 32) & 0x0000FFFF;
+        const uint32 Part6 = (m[1] >> 00) & 0xFFFFFFFF;
         return TString::Format("%08X-%04X-%04X-%04X-%04X%08X", Part1, Part2, Part3, Part4, Part5, Part6);
     }
 
     void Write(IOutputStream& rOutput)
     {
-        rOutput.WriteLongLong(m[0]);
-        rOutput.WriteLongLong(m[1]);
+        rOutput.WriteULongLong(m[0]);
+        rOutput.WriteULongLong(m[1]);
     }
 
     void Serialize(IArchive& rArc)
@@ -54,21 +47,23 @@ public:
         else
         {
             TString Str;
-            if (rArc.IsWriter()) Str = ToString();
+            if (rArc.IsWriter())
+                Str = ToString();
             rArc.SerializePrimitive(Str, 0);
-            if (rArc.IsReader()) *this = FromString(Str);
+            if (rArc.IsReader())
+                *this = FromString(Str);
         }
     }
 
     // Operators
     bool operator==(const CSavedStateID& rkOther) const
     {
-        return (m[0] == rkOther.m[0] && m[1] == rkOther.m[1]);
+        return m == rkOther.m;
     }
 
     bool operator!=(const CSavedStateID& rkOther) const
     {
-        return !(*this == rkOther);
+        return !operator==(rkOther);
     }
 
     bool operator<(const CSavedStateID& rkOther) const