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/core.cpp | |
| 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/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 @@ #include <memory> -#include "common/make_unique.h" #include "common/logging/log.h" #include "core/core.h" @@ -74,8 +73,8 @@ void Stop() { /// Initialize the core void Init() { - g_sys_core = Common::make_unique<ARM_DynCom>(USER32MODE); - g_app_core = Common::make_unique<ARM_DynCom>(USER32MODE); + g_sys_core = std::make_unique<ARM_DynCom>(USER32MODE); + g_app_core = std::make_unique<ARM_DynCom>(USER32MODE); LOG_DEBUG(Core, "Initialized OK"); } |