Browse Source

Fixes to several problems with gcc.

Former-commit-id: f7908fdc6f
tempestpy_adaptions
dehnert 11 years ago
parent
commit
6e41ee360d
  1. 2
      CMakeLists.txt
  2. 2
      src/adapters/ExplicitModelAdapter.cpp
  3. 1
      src/settings/ArgumentValidators.h
  4. 4
      src/settings/Option.h

2
CMakeLists.txt

@ -339,6 +339,8 @@ endif()
if (ENABLE_GUROBI) if (ENABLE_GUROBI)
message (STATUS "Linking in Gurobi.") message (STATUS "Linking in Gurobi.")
include_directories(${GUROBI_ROOT}/include)
link_directories(${GUROBI_ROOT}/lib)
target_link_libraries(storm "gurobi55") target_link_libraries(storm "gurobi55")
target_link_libraries(storm-functional-tests "gurobi55") target_link_libraries(storm-functional-tests "gurobi55")
target_link_libraries(storm-performance-tests "gurobi55") target_link_libraries(storm-performance-tests "gurobi55")

2
src/adapters/ExplicitModelAdapter.cpp

@ -439,7 +439,7 @@ namespace storm {
std::vector<std::list<storm::ir::Command>::const_iterator> iteratorList(activeCommandList.size()); std::vector<std::list<storm::ir::Command>::const_iterator> iteratorList(activeCommandList.size());
// Initialize the list of iterators. // Initialize the list of iterators.
for (int i = 0; i < activeCommandList.size(); ++i) {
for (size_t i = 0; i < activeCommandList.size(); ++i) {
iteratorList[i] = activeCommandList[i].cbegin(); iteratorList[i] = activeCommandList[i].cbegin();
} }

1
src/settings/ArgumentValidators.h

@ -57,7 +57,6 @@ namespace storm {
static std::function<bool (std::string const, std::string&)> stringInListValidator(std::vector<std::string> list) { static std::function<bool (std::string const, std::string&)> stringInListValidator(std::vector<std::string> list) {
return [list] (std::string const inputString, std::string& errorMessageTarget) -> bool { return [list] (std::string const inputString, std::string& errorMessageTarget) -> bool {
bool containsElement = false;
std::string const lowerInputString = storm::utility::StringHelper::stringToLower(inputString); std::string const lowerInputString = storm::utility::StringHelper::stringToLower(inputString);
for (auto it = list.cbegin(); it != list.cend(); ++it) { for (auto it = list.cbegin(); it != list.cend(); ++it) {
if (storm::utility::StringHelper::stringToLower(*it).compare(lowerInputString) == 0) { if (storm::utility::StringHelper::stringToLower(*it).compare(lowerInputString) == 0) {

4
src/settings/Option.h

@ -61,7 +61,7 @@ namespace storm {
Option(Option const& other): longName(other.longName), shortName(other.shortName), description(other.description), moduleName(other.moduleName), isRequired(other.isRequired), hasBeenSet(other.hasBeenSet) { Option(Option const& other): longName(other.longName), shortName(other.shortName), description(other.description), moduleName(other.moduleName), isRequired(other.isRequired), hasBeenSet(other.hasBeenSet) {
// Copy all Arguments // Copy all Arguments
this->arguments.reserve(other.arguments.size()); this->arguments.reserve(other.arguments.size());
for (auto i = 0; i < other.arguments.size(); ++i) {
for (size_t i = 0; i < other.arguments.size(); ++i) {
// Clone gives a deep copy // Clone gives a deep copy
this->arguments.push_back(std::shared_ptr<ArgumentBase>(other.arguments.at(i).get()->clone())); this->arguments.push_back(std::shared_ptr<ArgumentBase>(other.arguments.at(i).get()->clone()));
} }
@ -96,7 +96,7 @@ namespace storm {
LOG4CPLUS_ERROR(logger, "Option::unify: Could not unify Option \"" << getLongName() << "\" because the Argument Counts are different!"); LOG4CPLUS_ERROR(logger, "Option::unify: Could not unify Option \"" << getLongName() << "\" because the Argument Counts are different!");
throw storm::exceptions::OptionUnificationException() << "Could not unify Option \"" << getLongName() << "\" because the Argument Counts are different!"; throw storm::exceptions::OptionUnificationException() << "Could not unify Option \"" << getLongName() << "\" because the Argument Counts are different!";
} }
for(auto i = 0; i != this->arguments.size(); i++) {
for(size_t i = 0; i != this->arguments.size(); i++) {
ArgumentBase* A = this->arguments.at(i).get(); ArgumentBase* A = this->arguments.at(i).get();
ArgumentBase* B = other.arguments.at(i).get(); ArgumentBase* B = other.arguments.at(i).get();

Loading…
Cancel
Save