summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorMathew Maidment <mathew1800@gmail.com>2016-04-06 02:10:11 +0200
committerMathew Maidment <mathew1800@gmail.com>2016-04-06 02:10:11 +0200
commitaa6380e5bc9c3b40e53c001e76838819d61ca62a (patch)
tree22d8a5dc94874820d5bd7a8964485153db234672 /src/citra_qt/main.cpp
parentMerge pull request #1620 from LFsWang/path (diff)
parentCommon: Remove Common::make_unique, use std::make_unique (diff)
downloadyuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.gz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.bz2
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.lz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.xz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.zst
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.zip
Diffstat (limited to 'src/citra_qt/main.cpp')
-rw-r--r--src/citra_qt/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f621f5d66..ca0ae6f7b 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -3,6 +3,7 @@
// Refer to the license.txt file included.
#include <clocale>
+#include <memory>
#include <thread>
#include <QDesktopWidget>
@@ -30,7 +31,6 @@
#include "citra_qt/debugger/ramview.h"
#include "citra_qt/debugger/registers.h"
-#include "common/make_unique.h"
#include "common/microprofile.h"
#include "common/platform.h"
#include "common/scm_rev.h"
@@ -319,7 +319,7 @@ void GMainWindow::BootGame(const std::string& filename) {
return;
// Create and start the emulation thread
- emu_thread = Common::make_unique<EmuThread>(render_window);
+ emu_thread = std::make_unique<EmuThread>(render_window);
emit EmulationStarting(emu_thread.get());
render_window->moveContext();
emu_thread->start();