diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-11 22:40:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 22:40:08 -0400 |
| commit | ee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch) | |
| tree | e4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/core.cpp | |
| parent | 9c977d221505fe6c604aea4f55c837cf10c555bb (diff) | |
| parent | 0a93b45b6a2662c69320e6c69f8024e26909a168 (diff) | |
Merge pull request #1020 from lioncash/namespace
core: Namespace EmuWindow
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 4 |
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() { return RunLoop(false); } -System::ResultStatus System::Load(EmuWindow& emu_window, const std::string& filepath) { +System::ResultStatus System::Load(Frontend::EmuWindow& emu_window, const std::string& filepath) { app_loader = Loader::GetLoader(virtual_filesystem->OpenFile(filepath, FileSys::Mode::Read)); if (!app_loader) { @@ -151,7 +151,7 @@ Cpu& System::CpuCore(size_t core_index) { return *cpu_cores[core_index]; } -System::ResultStatus System::Init(EmuWindow& emu_window) { +System::ResultStatus System::Init(Frontend::EmuWindow& emu_window) { LOG_DEBUG(HW_Memory, "initialized OK"); CoreTiming::Init(); |