diff options
| author |  Mathew Maidment | 2016-04-05 20:10:11 -0400 |
|---|---|---|
| committer | Mathew Maidment | 2016-04-05 20:10:11 -0400 |
| commit | aa6380e5bc9c3b40e53c001e76838819d61ca62a (patch) | |
| tree | 22d8a5dc94874820d5bd7a8964485153db234672 /src/core/arm/dyncom | |
| parent | Merge pull request #1620 from LFsWang/path (diff) | |
| parent | Common: Remove Common::make_unique, use std::make_unique (diff) | |
| download | yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.gz yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.xz yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.zip | |
Merge pull request #1643 from MerryMage/make_unique
Common: Remove Common::make_unique, use std::make_unique
Diffstat (limited to 'src/core/arm/dyncom')
| -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 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <cstring> | 5 | #include <cstring> |
| 6 | 6 | #include <memory> | |
| 7 | #include "common/make_unique.h" | ||
| 8 | 7 | ||
| 9 | #include "core/arm/skyeye_common/armstate.h" | 8 | #include "core/arm/skyeye_common/armstate.h" |
| 10 | #include "core/arm/skyeye_common/armsupp.h" | 9 | #include "core/arm/skyeye_common/armsupp.h" |
| @@ -18,7 +17,7 @@ | |||
| 18 | #include "core/core_timing.h" | 17 | #include "core/core_timing.h" |
| 19 | 18 | ||
| 20 | ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) { | 19 | ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) { |
| 21 | state = Common::make_unique<ARMul_State>(initial_mode); | 20 | state = std::make_unique<ARMul_State>(initial_mode); |
| 22 | } | 21 | } |
| 23 | 22 | ||
| 24 | ARM_DynCom::~ARM_DynCom() { | 23 | ARM_DynCom::~ARM_DynCom() { |