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(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 -#include #include +#include #include @@ -31,12 +31,12 @@ private: static constexpr size_t align_size = 16; // bytes struct ConstantHash { - std::size_t operator()(const std::tuple& constant) const { - return std::get<0>(constant) ^ std::rotl(std::get<1>(constant), 1); + std::size_t operator()(const std::pair& constant) const noexcept { + return constant.first ^ std::rotl(constant.second, 1); } }; - std::unordered_map, void*, ConstantHash> constant_info; + std::unordered_map, void*, ConstantHash> constant_info; BlockOfCode& code; size_t pool_size;