From 28d3c09df91d7406d8dd71354c20366889b60c88 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Wed, 6 Apr 2016 20:36:53 +0100
Subject: [PATCH] fixup! Common: Common::make_unique -> std::make_unique

---
 src/core/arm/decoder/arm.cpp              | 4 ++--
 src/core/arm/jit_x64/interface.cpp        | 4 ++--
 src/tests/core/arm/jit_x64/fuzz_thumb.cpp | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/core/arm/decoder/arm.cpp b/src/core/arm/decoder/arm.cpp
index f95d75cf0..2c4fc65d0 100644
--- a/src/core/arm/decoder/arm.cpp
+++ b/src/core/arm/decoder/arm.cpp
@@ -6,13 +6,13 @@
 #include <array>
 #include <cstddef>
 #include <cstring>
+#include <memory>
 #include <utility>
 
 #include <boost/optional.hpp>
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "common/make_unique.h"
 
 #include "core/arm/decoder/decoder.h"
 
@@ -58,7 +58,7 @@ template<size_t NumArgs, typename Function>
 static std::unique_ptr<ArmMatcher> MakeMatcher(const char* const format, Function fn) {
     ASSERT(strlen(format) == 32);
 
-    auto ret = Common::make_unique<Impl::MatcherImpl<NumArgs, Function>>();
+    auto ret = std::make_unique<Impl::MatcherImpl<NumArgs, Function>>();
     ret->fn = fn;
     ret->masks.fill(0);
     ret->shifts.fill(0);
diff --git a/src/core/arm/jit_x64/interface.cpp b/src/core/arm/jit_x64/interface.cpp
index 038bbccc2..2ffb24570 100644
--- a/src/core/arm/jit_x64/interface.cpp
+++ b/src/core/arm/jit_x64/interface.cpp
@@ -4,9 +4,9 @@
 // Refer to the license.txt file included.
 
 #include <cstring>
+#include <memory>
 
 #include "common/assert.h"
-#include "common/make_unique.h"
 #include "common/x64/abi.h"
 #include "common/x64/emitter.h"
 
@@ -94,7 +94,7 @@ struct ARM_Jit::Impl {
     JitX64 compiler{ &block_of_code };
 };
 
-ARM_Jit::ARM_Jit(PrivilegeMode initial_mode) : impl(std::make_unique<Impl>()), state(Common::make_unique<JitState>()) {
+ARM_Jit::ARM_Jit(PrivilegeMode initial_mode) : impl(std::make_unique<Impl>()), state(std::make_unique<JitState>()) {
     ASSERT_MSG(initial_mode == PrivilegeMode::USER32MODE, "Unimplemented");
     ClearCache();
 }
diff --git a/src/tests/core/arm/jit_x64/fuzz_thumb.cpp b/src/tests/core/arm/jit_x64/fuzz_thumb.cpp
index 22eb49f2a..50d0f7873 100644
--- a/src/tests/core/arm/jit_x64/fuzz_thumb.cpp
+++ b/src/tests/core/arm/jit_x64/fuzz_thumb.cpp
@@ -8,7 +8,6 @@
 
 #include <catch.hpp>
 
-#include "common/make_unique.h"
 #include "common/scope_exit.h"
 
 #include "core/arm/dyncom/arm_dyncom.h"