summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorGravatar bunnei2015-12-29 22:34:32 -0500
committerGravatar bunnei2015-12-29 22:34:32 -0500
commit8a24214b46cf86349528e9c1d79a970a5a0ad1a4 (patch)
tree7f8b3ed355becf4d26ad1ee87fd91b7d845d8d7a /src/core/core.h
parentMerge pull request #1305 from lioncash/override (diff)
parentcore: Use unique_ptr for holding the interpreter instances (diff)
downloadyuzu-8a24214b46cf86349528e9c1d79a970a5a0ad1a4.tar.gz
yuzu-8a24214b46cf86349528e9c1d79a970a5a0ad1a4.tar.xz
yuzu-8a24214b46cf86349528e9c1d79a970a5a0ad1a4.zip
Merge pull request #1303 from lioncash/unique
core: Use unique_ptr for holding the interpreter instances
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 491230a74..453e0a5f0 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -4,6 +4,7 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <memory>
7#include "common/common_types.h" 8#include "common/common_types.h"
8 9
9class ARM_Interface; 10class ARM_Interface;
@@ -23,8 +24,8 @@ struct ThreadContext {
23 u32 fpexc; 24 u32 fpexc;
24}; 25};
25 26
26extern ARM_Interface* g_app_core; ///< ARM11 application core 27extern std::unique_ptr<ARM_Interface> g_app_core; ///< ARM11 application core
27extern ARM_Interface* g_sys_core; ///< ARM11 system (OS) core 28extern std::unique_ptr<ARM_Interface> g_sys_core; ///< ARM11 system (OS) core
28 29
29//////////////////////////////////////////////////////////////////////////////////////////////////// 30////////////////////////////////////////////////////////////////////////////////////////////////////
30 31