summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-09-07 05:05:22 +0200
committerarchshift <admin@archshift.com>2014-09-07 21:09:02 +0200
commit1c02c03e3204c3f2ec4e7018ed199cc28e667d04 (patch)
tree0871a248e13b73fa0a6db3583da604fe3aa16801
parentbootmanager::EmuThread: fixed initialization order (diff)
downloadyuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar.gz
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar.bz2
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar.lz
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar.xz
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.tar.zst
yuzu-1c02c03e3204c3f2ec4e7018ed199cc28e667d04.zip
-rw-r--r--src/core/arm/disassembler/load_symbol_map.cpp2
-rw-r--r--src/video_core/video_core.cpp7
2 files changed, 1 insertions, 8 deletions
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp
index d7fc0a042..b4a5429a2 100644
--- a/src/core/arm/disassembler/load_symbol_map.cpp
+++ b/src/core/arm/disassembler/load_symbol_map.cpp
@@ -19,7 +19,7 @@ void LoadSymbolMap(std::string filename) {
std::ifstream infile(filename);
std::string address_str, function_name, line;
- u32 size, address;
+ u32 size;
while (std::getline(infile, line)) {
std::istringstream iss(line);
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 9aaff4917..c779771c5 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -21,13 +21,6 @@ EmuWindow* g_emu_window = NULL; ///< Frontend emulator window
RendererBase* g_renderer = NULL; ///< Renderer plugin
int g_current_frame = 0;
-/// Start the video core
-void Start() {
- if (g_emu_window == NULL) {
- ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!");
- }
-}
-
/// Initialize the video core
void Init(EmuWindow* emu_window) {
g_emu_window = emu_window;