Merge branch 'future' into menu_games

Former-commit-id: deff6eb8d0

CMakeLists.txt

@@ -120,8 +120,7 @@ else(CLANG)
     endif()
     
     add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=${CLANG_STDLIB} -Wall -pedantic -Wno-newline-eof -Wno-mismatched-tags -ftemplate-depth=1024")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
+	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -stdlib=${CLANG_STDLIB} -Wall -pedantic -Wno-newline-eof -Wno-mismatched-tags -Wno-unused-local-typedefs -ftemplate-depth=1024")    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic")
 
     if(FORCE_COLOR)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")

test/functional/solver/MathsatSmtSolverTest.cpp

@@ -162,7 +162,6 @@ TEST(MathsatSmtSolver, AllSat) {
     std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
 
     storm::solver::MathsatSmtSolver s(*manager);
-    storm::solver::SmtSolver::CheckResult result = storm::solver::SmtSolver::CheckResult::Unknown;
     
     storm::expressions::Variable a = manager->declareIntegerVariable("a");
     storm::expressions::Variable b = manager->declareIntegerVariable("b");