summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar Mathew Maidment2016-04-05 20:10:11 -0400
committerGravatar Mathew Maidment2016-04-05 20:10:11 -0400
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.gz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.xz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.zip
Merge pull request #1643 from MerryMage/make_unique
Common: Remove Common::make_unique, use std::make_unique
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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <clocale> 5#include <clocale>
6#include <memory>
6#include <thread> 7#include <thread>
7 8
8#include <QDesktopWidget> 9#include <QDesktopWidget>
@@ -30,7 +31,6 @@
30#include "citra_qt/debugger/ramview.h" 31#include "citra_qt/debugger/ramview.h"
31#include "citra_qt/debugger/registers.h" 32#include "citra_qt/debugger/registers.h"
32 33
33#include "common/make_unique.h"
34#include "common/microprofile.h" 34#include "common/microprofile.h"
35#include "common/platform.h" 35#include "common/platform.h"
36#include "common/scm_rev.h" 36#include "common/scm_rev.h"
@@ -319,7 +319,7 @@ void GMainWindow::BootGame(const std::string& filename) {
319 return; 319 return;
320 320
321 // Create and start the emulation thread 321 // Create and start the emulation thread
322 emu_thread = Common::make_unique<EmuThread>(render_window); 322 emu_thread = std::make_unique<EmuThread>(render_window);
323 emit EmulationStarting(emu_thread.get()); 323 emit EmulationStarting(emu_thread.get());
324 render_window->moveContext(); 324 render_window->moveContext();
325 emu_thread->start(); 325 emu_thread->start();