summaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-11 22:40:08 -0400
committerGravatar GitHub2018-08-11 22:40:08 -0400
commitee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch)
treee4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/core.cpp
parentMerge pull request #1021 from lioncash/warn (diff)
parentcore: Namespace EmuWindow (diff)
downloadyuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.gz
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.xz
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.zip
Merge pull request #1020 from lioncash/namespace
core: Namespace EmuWindow
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 6b8004eb2..83d4d742b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -88,7 +88,7 @@ System::ResultStatus System::SingleStep() {
88 return RunLoop(false); 88 return RunLoop(false);
89} 89}
90 90
91System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) { 91System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) {
92 app_loader = Loader::GetLoader(virtual_filesystem->OpenFile(filepath, FileSys::Mode::Read)); 92 app_loader = Loader::GetLoader(virtual_filesystem->OpenFile(filepath, FileSys::Mode::Read));
93 93
94 if (!app_loader) { 94 if (!app_loader) {
@@ -151,7 +151,7 @@ Cpu& System::CpuCore(size_t core_index) {
151 return *cpu_cores[core_index]; 151 return *cpu_cores[core_index];
152} 152}
153 153
154System::ResultStatus System::Init(EmuWindow& emu_window) { 154System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) {
155 LOG_DEBUG(HW_Memory, "initialized OK"); 155 LOG_DEBUG(HW_Memory, "initialized OK");
156 156
157 CoreTiming::Init(); 157 CoreTiming::Init();