summaryrefslogtreecommitdiff
path: root/src/citra_qt/main.cpp
diff options
context:
space:
mode:
authorGravatar MerryMage2016-04-05 13:29:55 +0100
committerGravatar MerryMage2016-04-05 13:31:17 +0100
commita06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch)
treee1f81e5faebce62810ac079b8a6e616182c34959 /src/citra_qt/main.cpp
parentMerge pull request #1302 from Subv/save_fix (diff)
downloadyuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip
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 32cceaf7e..ebd52a7b3 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();