From 7a89e3397b920c7ba78a02c310e87d1acf6b203e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 May 2020 14:08:05 -0400 Subject: No need for the helper method in calcrom.cpp --- .travis/calcrom/calcrom.cpp | 6 +----- CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis/calcrom/calcrom.cpp b/.travis/calcrom/calcrom.cpp index 13a95b29..3f48511b 100644 --- a/.travis/calcrom/calcrom.cpp +++ b/.travis/calcrom/calcrom.cpp @@ -12,8 +12,7 @@ using namespace std; struct Glob : public vector { glob_t glob_result; public: - void glob(string const & pattern) { - clear(); + Glob(string const & pattern) { int result = ::glob(pattern.c_str(), GLOB_TILDE | GLOB_BRACE, NULL, &glob_result); if (result) { stringstream ss; @@ -21,9 +20,6 @@ public: throw runtime_error(ss.str()); } assign(glob_result.gl_pathv, glob_result.gl_pathv + glob_result.gl_pathc); - } - Glob(string const & pattern) { - glob(pattern); }; void operator~() { globfree(&glob_result); diff --git a/CMakeLists.txt b/CMakeLists.txt index 60be15bc..aac9651e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required (VERSION 2.8.11) project(PokeDiamond) +set(CMAKE_CXX_STANDARD 11) # TODO: Add commands -- cgit v1.2.3