From a06dcfeb61d6769c562d6d50cfa3c0024176ae82 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 5 Apr 2016 13:29:55 +0100 Subject: Common: Remove Common::make_unique, use std::make_unique --- src/citra/citra.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/citra/citra.cpp') 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 #include #include +#include // 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(Settings::values.gdbstub_port)); - std::unique_ptr emu_window = Common::make_unique(); + std::unique_ptr emu_window = std::make_unique(); VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit; -- cgit v1.2.3