diff options
| author | Mathew Maidment <mathew1800@gmail.com> | 2016-04-05 20:10:11 -0400 |
|---|---|---|
| committer | Mathew Maidment <mathew1800@gmail.com> | 2016-04-05 20:10:11 -0400 |
| commit | aa6380e5bc9c3b40e53c001e76838819d61ca62a (patch) | |
| tree | 22d8a5dc94874820d5bd7a8964485153db234672 /src/core/arm | |
| parent | b39340849631f565cf5c32bfdbab9fdc0bd4db9d (diff) | |
| parent | a06dcfeb61d6769c562d6d50cfa3c0024176ae82 (diff) | |
Merge pull request #1643 from MerryMage/make_unique
Common: Remove Common::make_unique, use std::make_unique
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index f3be2c857..947f5094b 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -3,8 +3,7 @@ // Refer to the license.txt file included. #include <cstring> - -#include "common/make_unique.h" +#include <memory> #include "core/arm/skyeye_common/armstate.h" #include "core/arm/skyeye_common/armsupp.h" @@ -18,7 +17,7 @@ #include "core/core_timing.h" ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) { - state = Common::make_unique<ARMul_State>(initial_mode); + state = std::make_unique<ARMul_State>(initial_mode); } ARM_DynCom::~ARM_DynCom() { |