summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-04-05 14:29:55 +0200
committerMerryMage <MerryMage@users.noreply.github.com>2016-04-05 14:31:17 +0200
commita06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch)
treee1f81e5faebce62810ac079b8a6e616182c34959 /src/citra
parentMerge pull request #1302 from Subv/save_fix (diff)
downloadyuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.bz2
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.lz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.zst
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/citra.cpp4
-rw-r--r--src/citra/config.cpp7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 40e40f192..b12369136 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -5,6 +5,7 @@
#include <string>
#include <thread>
#include <iostream>
+#include <memory>
// This needs to be included before getopt.h because the latter #defines symbols used by it
#include "common/microprofile.h"
@@ -19,7 +20,6 @@
#include "common/logging/log.h"
#include "common/logging/backend.h"
#include "common/logging/filter.h"
-#include "common/make_unique.h"
#include "common/scope_exit.h"
#include "core/settings.h"
@@ -79,7 +79,7 @@ int main(int argc, char **argv) {
GDBStub::ToggleServer(Settings::values.use_gdbstub);
GDBStub::SetServerPort(static_cast<u32>(Settings::values.gdbstub_port));
- std::unique_ptr<EmuWindow_SDL2> emu_window = Common::make_unique<EmuWindow_SDL2>();
+ std::unique_ptr<EmuWindow_SDL2> emu_window = std::make_unique<EmuWindow_SDL2>();
VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer;
VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit;
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 9034b188e..6b6617352 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <memory>
+
#include <inih/cpp/INIReader.h>
#include <SDL.h>
@@ -10,7 +12,6 @@
#include "common/file_util.h"
#include "common/logging/log.h"
-#include "common/make_unique.h"
#include "core/settings.h"
@@ -19,7 +20,7 @@
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";
- sdl2_config = Common::make_unique<INIReader>(sdl2_config_loc);
+ sdl2_config = std::make_unique<INIReader>(sdl2_config_loc);
Reload();
}
@@ -31,7 +32,7 @@ bool Config::LoadINI(const std::string& default_contents, bool retry) {
LOG_WARNING(Config, "Failed to load %s. Creating file from defaults...", location);
FileUtil::CreateFullPath(location);
FileUtil::WriteStringToFile(true, default_contents, location);
- sdl2_config = Common::make_unique<INIReader>(location); // Reopen file
+ sdl2_config = std::make_unique<INIReader>(location); // Reopen file
return LoadINI(default_contents, false);
}