From 598e4d2f6ccfc3dc774a28be53d8b1d78ebbd08d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 25 Sep 2018 16:04:53 -0400 Subject: [PATCH] core_cpu: Make arm_interface instances a std::unique_ptr This is only exposed by reference, so we can just make it a unique pointer to get rid of the need to also use reference counting for the pointer. --- src/core/core_cpu.cpp | 6 +++--- src/core/core_cpu.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index 0140e97133..265f8ed9cc 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -55,13 +55,13 @@ Cpu::Cpu(std::shared_ptr exclusive_monitor, if (Settings::values.use_cpu_jit) { #ifdef ARCHITECTURE_x86_64 - arm_interface = std::make_shared(exclusive_monitor, core_index); + arm_interface = std::make_unique(exclusive_monitor, core_index); #else - arm_interface = std::make_shared(); + arm_interface = std::make_unique(); LOG_WARNING(Core, "CPU JIT requested, but Dynarmic not available"); #endif } else { - arm_interface = std::make_shared(); + arm_interface = std::make_unique(); } scheduler = std::make_shared(*arm_interface); diff --git a/src/core/core_cpu.h b/src/core/core_cpu.h index 6855329654..ee7e04abc8 100644 --- a/src/core/core_cpu.h +++ b/src/core/core_cpu.h @@ -76,7 +76,7 @@ public: private: void Reschedule(); - std::shared_ptr arm_interface; + std::unique_ptr arm_interface; std::shared_ptr cpu_barrier; std::shared_ptr scheduler;