fixup! Common: Common::make_unique -> std::make_unique

This commit is contained in:
MerryMage 2016-04-06 20:36:53 +01:00
parent 71d1031b4c
commit 28d3c09df9
3 changed files with 4 additions and 5 deletions

View File

@ -6,13 +6,13 @@
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
#include <memory>
#include <utility> #include <utility>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include "common/assert.h" #include "common/assert.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/make_unique.h"
#include "core/arm/decoder/decoder.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) { static std::unique_ptr<ArmMatcher> MakeMatcher(const char* const format, Function fn) {
ASSERT(strlen(format) == 32); 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->fn = fn;
ret->masks.fill(0); ret->masks.fill(0);
ret->shifts.fill(0); ret->shifts.fill(0);

View File

@ -4,9 +4,9 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstring> #include <cstring>
#include <memory>
#include "common/assert.h" #include "common/assert.h"
#include "common/make_unique.h"
#include "common/x64/abi.h" #include "common/x64/abi.h"
#include "common/x64/emitter.h" #include "common/x64/emitter.h"
@ -94,7 +94,7 @@ struct ARM_Jit::Impl {
JitX64 compiler{ &block_of_code }; 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"); ASSERT_MSG(initial_mode == PrivilegeMode::USER32MODE, "Unimplemented");
ClearCache(); ClearCache();
} }

View File

@ -8,7 +8,6 @@
#include <catch.hpp> #include <catch.hpp>
#include "common/make_unique.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "core/arm/dyncom/arm_dyncom.h" #include "core/arm/dyncom/arm_dyncom.h"