Browse Source

fixed a couple of warnings

main
dehnert 8 years ago
parent
commit
05203792f2
  1. 4
      resources/3rdparty/cpptemplate/cpptempl.h
  2. 2
      src/storm/generator/JaniNextStateGenerator.cpp
  3. 10
      src/storm/settings/ArgumentTypeInferationHelper.cpp
  4. 2
      src/storm/solver/stateelimination/StatePriorityQueue.cpp
  5. 4
      src/storm/storage/bisimulation/Partition.cpp
  6. 1
      src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp

4
resources/3rdparty/cpptemplate/cpptempl.h

@ -114,8 +114,8 @@ namespace cpptempl
{
public:
TemplateException(std::string reason) : m_reason(reason){}
~TemplateException() throw() {}
const char* what() throw() {
~TemplateException() {}
const char* what() const noexcept {
return m_reason.c_str();
}
private:

2
src/storm/generator/JaniNextStateGenerator.cpp

@ -593,7 +593,7 @@ namespace storm {
auto index = std::distance(enabledEdges.begin(), edgeSetIt);
if (it != writtenGlobalVariables.end()) {
STORM_LOG_THROW(it->second == index, storm::exceptions::WrongFormatException, "Multiple writes to global variable '" << globalVariable.getName() << "' in synchronizing edges.");
STORM_LOG_THROW(it->second == static_cast<uint64_t>(index), storm::exceptions::WrongFormatException, "Multiple writes to global variable '" << globalVariable.getName() << "' in synchronizing edges.");
} else {
writtenGlobalVariables.emplace(globalVariable, index);
}

10
src/storm/settings/ArgumentTypeInferationHelper.cpp

@ -34,7 +34,7 @@ namespace storm {
}
template <typename T>
std::string const& inferToString(ArgumentType const& argumentType, T const& value) {
std::string const& inferToString(ArgumentType const&, T const&) {
STORM_LOG_THROW(false, storm::exceptions::InternalTypeErrorException, "Unable to infer string from non-string argument value.");
}
@ -45,7 +45,7 @@ namespace storm {
}
template <typename T>
int_fast64_t inferToInteger(ArgumentType const& argumentType, T const& value) {
int_fast64_t inferToInteger(ArgumentType const&, T const&) {
STORM_LOG_THROW(false, storm::exceptions::InternalTypeErrorException, "Unable to infer integer from non-integer argument value.");
}
@ -56,7 +56,7 @@ namespace storm {
}
template <typename T>
uint_fast64_t inferToUnsignedInteger(ArgumentType const& argumentType, T const& value) {
uint_fast64_t inferToUnsignedInteger(ArgumentType const&, T const&) {
STORM_LOG_THROW(false, storm::exceptions::InternalTypeErrorException, "Unable to infer unsigned integer from non-unsigned argument value.");
}
@ -67,7 +67,7 @@ namespace storm {
}
template <typename T>
double inferToDouble(ArgumentType const& argumentType, T const& value) {
double inferToDouble(ArgumentType const&, T const&) {
STORM_LOG_THROW(false, storm::exceptions::InternalTypeErrorException, "Unable to infer double from non-double argument value.");
}
@ -78,7 +78,7 @@ namespace storm {
}
template <typename T>
bool inferToBoolean(ArgumentType const& argumentType, T const& value) {
bool inferToBoolean(ArgumentType const&, T const&) {
STORM_LOG_THROW(false, storm::exceptions::InternalTypeErrorException, "Unable to infer boolean from non-boolean argument value.");
}

2
src/storm/solver/stateelimination/StatePriorityQueue.cpp

@ -4,7 +4,7 @@ namespace storm {
namespace solver {
namespace stateelimination {
void StatePriorityQueue::update(storm::storage::sparse::state_type state) {
void StatePriorityQueue::update(storm::storage::sparse::state_type) {
// Intentionally left empty.
}

4
src/storm/storage/bisimulation/Partition.cpp

@ -272,7 +272,7 @@ namespace storm {
// points.
template<typename DataType>
bool Partition<DataType>::splitBlock(Block<DataType>& block, std::function<bool (storm::storage::sparse::state_type, storm::storage::sparse::state_type)> const& less) {
return this->splitBlock(block, less, [] (Block<DataType>& block) {});
return this->splitBlock(block, less, [] (Block<DataType>&) {});
}
template<typename DataType>
@ -289,7 +289,7 @@ namespace storm {
template<typename DataType>
bool Partition<DataType>::split(std::function<bool (storm::storage::sparse::state_type, storm::storage::sparse::state_type)> const& less) {
return this->split(less, [] (Block<DataType>& block) {});
return this->split(less, [] (Block<DataType>&) {});
}
template<typename DataType>

1
src/storm/storage/dd/sylvan/InternalSylvanAdd.cpp

@ -880,7 +880,6 @@ namespace storm {
STORM_LOG_ASSERT(mtbdd_isleaf(node), "Expected leaf, but got variable " << mtbdd_getvar(node) << ".");
bool negated = mtbdd_hascomp(node);
MTBDD n = mtbdd_regular(node);
STORM_LOG_ASSERT(mtbdd_gettype(node) == sylvan_storm_rational_function_get_type(), "Expected a storm::RationalFunction value.");
uint64_t value = mtbdd_getvalue(node);

Loading…
Cancel
Save