Merge branch 'master' into prism-pomdp

resources/3rdparty/CMakeLists.txt

@@ -496,7 +496,7 @@ add_dependencies(sylvan_STATIC sylvan)
 
 list(APPEND STORM_DEP_TARGETS sylvan_STATIC)
 
-find_package(Hwloc QUIET REQUIRED)
+find_package(HWLOC QUIET REQUIRED)
 if(HWLOC_FOUND)
     message(STATUS "Storm - Linking with hwloc ${HWLOC_VERSION}.")
     add_imported_library(hwloc STATIC ${HWLOC_LIBRARIES} "")

resources/cmake/find_modules/FindZ3.cmake

@@ -32,7 +32,7 @@ set(Z3_SOLVER ${Z3_EXEC})
 # set the LIBZ3_FOUND variable by utilizing the following macro
 # (which also handles the REQUIRED and QUIET arguments)
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(z3 DEFAULT_MSG
+find_package_handle_standard_args(Z3 DEFAULT_MSG
                                   Z3_LIBRARY Z3_INCLUDE_DIR)
 
 IF (NOT Z3_FIND_QUIETLY)

src/storm-cli-utilities/model-handling.h

@@ -276,6 +276,7 @@ namespace storm {
                         case ModelProcessingInformation::ValueType::FinitePrecision:
                             return storm::utility::canHandle<double>(mpi.engine, input.preprocessedProperties.is_initialized() ? input.preprocessedProperties.get() : input.properties, input.model.get());
                     }
+                    return false;
                 };
                 mpi.isCompatible = checkCompatibleSettings();
                 if (!mpi.isCompatible) {

src/storm/settings/SettingsManager.cpp

@@ -403,7 +403,7 @@ namespace storm {
             STORM_LOG_THROW(moduleIterator == this->modules.end(), storm::exceptions::IllegalFunctionCallException, "Unable to register module '" << moduleSettings->getModuleName() << "' because a module with the same name already exists.");
             
             // Take over the module settings object.
-            std::string const& moduleName = moduleSettings->getModuleName();
+            std::string moduleName = moduleSettings->getModuleName();
             this->moduleNames.push_back(moduleName);
             this->modules.emplace(moduleSettings->getModuleName(), std::move(moduleSettings));
             auto iterator = this->modules.find(moduleName);