From 7cafd61c388c466a6308efd17c9cb40cd8ea642d Mon Sep 17 00:00:00 2001 From: dehnert Date: Mon, 31 Aug 2015 19:11:49 +0200 Subject: [PATCH] switched gcc to use c++14 as well Former-commit-id: 32d9c461920d25e7902e41cfb92a47003368836b --- CMakeLists.txt | 2 +- src/solver/SolveGoal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f58c4abc..e9338ba5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -funroll-loops") add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -pedantic -Wno-deprecated-declarations -Wno-unused-local-typedefs") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -pedantic -Wno-deprecated-declarations -Wno-unused-local-typedefs") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wno-deprecated-declarations") # Turn on popcnt instruction if desired (yes by default) diff --git a/src/solver/SolveGoal.h b/src/solver/SolveGoal.h index 6b4246800..fe573dd3a 100644 --- a/src/solver/SolveGoal.h +++ b/src/solver/SolveGoal.h @@ -49,7 +49,7 @@ namespace storm { bool boundIsALowerBound() const { return (boundType == storm::logic::ComparisonType::Greater | - boundType == storm::logic::ComparisonType::GreaterEqual); ; + boundType == storm::logic::ComparisonType::GreaterEqual); } VT thresholdValue() const { return threshold; } storm::storage::BitVector relevantColumns() const { return relevantColumnVector; }