diff options
| author | 2016-04-05 13:29:55 +0100 | |
|---|---|---|
| committer | 2016-04-05 13:31:17 +0100 | |
| commit | a06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch) | |
| tree | e1f81e5faebce62810ac079b8a6e616182c34959 /src/core/core.cpp | |
| parent | Merge pull request #1302 from Subv/save_fix (diff) | |
| download | yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip | |
Common: Remove Common::make_unique, use std::make_unique
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 84d6c392e..3bb843aab 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | 4 | ||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | 6 | ||
| 7 | #include "common/make_unique.h" | ||
| 8 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 9 | 8 | ||
| 10 | #include "core/core.h" | 9 | #include "core/core.h" |
| @@ -74,8 +73,8 @@ void Stop() { | |||
| 74 | 73 | ||
| 75 | /// Initialize the core | 74 | /// Initialize the core |
| 76 | void Init() { | 75 | void Init() { |
| 77 | g_sys_core = Common::make_unique<ARM_DynCom>(USER32MODE); | 76 | g_sys_core = std::make_unique<ARM_DynCom>(USER32MODE); |
| 78 | g_app_core = Common::make_unique<ARM_DynCom>(USER32MODE); | 77 | g_app_core = std::make_unique<ARM_DynCom>(USER32MODE); |
| 79 | 78 | ||
| 80 | LOG_DEBUG(Core, "Initialized OK"); | 79 | LOG_DEBUG(Core, "Initialized OK"); |
| 81 | } | 80 | } |