From a5b2b77d2a72bb0b00c6aa791197cbadefc8b369 Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Mon, 20 Apr 2020 19:49:25 +0200 Subject: [PATCH] Use C++14 so we have make_unique --- CMakeLists.txt | 2 +- src/util/smart_ptr.hpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fe0d61b..36183216 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) project(magicseteditor) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED True) find_package(wxWidgets 3 REQUIRED COMPONENTS core base net html) diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp index be3abb71..c7069137 100644 --- a/src/util/smart_ptr.hpp +++ b/src/util/smart_ptr.hpp @@ -21,6 +21,7 @@ using std::unique_ptr; using std::static_pointer_cast; using std::dynamic_pointer_cast; using std::make_shared; +using std::make_unique; // TODO: remove scoped_ptr template using scoped_ptr = unique_ptr;