From e57bb0569ac87d73d1a9f60c12a8a4043f1d3ba8 Mon Sep 17 00:00:00 2001
From: Wunkolo <Wunkolo@gmail.com>
Date: Thu, 23 Dec 2021 18:16:55 -0800
Subject: [PATCH] constant_pool: Convert hashtype from `tuple` to `pair`

---
 src/dynarmic/backend/x64/constant_pool.cpp | 2 +-
 src/dynarmic/backend/x64/constant_pool.h   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dynarmic/backend/x64/constant_pool.cpp b/src/dynarmic/backend/x64/constant_pool.cpp
index 2f501523..39ffdf14 100644
--- a/src/dynarmic/backend/x64/constant_pool.cpp
+++ b/src/dynarmic/backend/x64/constant_pool.cpp
@@ -21,7 +21,7 @@ ConstantPool::ConstantPool(BlockOfCode& code, size_t size)
 }
 
 Xbyak::Address ConstantPool::GetConstant(const Xbyak::AddressFrame& frame, u64 lower, u64 upper) {
-    const auto constant = std::make_tuple(lower, upper);
+    const auto constant = std::make_pair(lower, upper);
     auto iter = constant_info.find(constant);
     if (iter == constant_info.end()) {
         ASSERT(static_cast<size_t>(current_pool_ptr - pool_begin) < pool_size);
diff --git a/src/dynarmic/backend/x64/constant_pool.h b/src/dynarmic/backend/x64/constant_pool.h
index 1e4fb695..c7d11df7 100644
--- a/src/dynarmic/backend/x64/constant_pool.h
+++ b/src/dynarmic/backend/x64/constant_pool.h
@@ -6,8 +6,8 @@
 #pragma once
 
 #include <bit>
-#include <tuple>
 #include <unordered_map>
+#include <utility>
 
 #include <xbyak/xbyak.h>
 
@@ -31,12 +31,12 @@ private:
     static constexpr size_t align_size = 16;  // bytes
 
     struct ConstantHash {
-        std::size_t operator()(const std::tuple<u64, u64>& constant) const {
-            return std::get<0>(constant) ^ std::rotl<u64>(std::get<1>(constant), 1);
+        std::size_t operator()(const std::pair<u64, u64>& constant) const noexcept {
+            return constant.first ^ std::rotl<u64>(constant.second, 1);
         }
     };
 
-    std::unordered_map<std::tuple<u64, u64>, void*, ConstantHash> constant_info;
+    std::unordered_map<std::pair<u64, u64>, void*, ConstantHash> constant_info;
 
     BlockOfCode& code;
     size_t pool_size;