Browse Source

explicitly state that we override the functions from the expression visitor

tempestpy_adaptions
Sebastian Junges 4 years ago
parent
commit
1cd97080d4
  1. 3
      src/storm/storage/jani/ArrayEliminator.cpp
  2. 2
      src/storm/storage/jani/FunctionEliminator.cpp
  3. 1
      src/storm/storage/jani/JSONExporter.h
  4. 2
      src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp
  5. 1
      src/storm/storage/jani/traverser/FunctionCallExpressionFinder.cpp

3
src/storm/storage/jani/ArrayEliminator.cpp

@ -27,6 +27,8 @@ namespace storm {
class MaxArraySizeExpressionVisitor : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
MaxArraySizeExpressionVisitor() = default;
virtual ~MaxArraySizeExpressionVisitor() = default;
@ -128,6 +130,7 @@ namespace storm {
class ArrayExpressionEliminationVisitor : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
typedef std::shared_ptr<storm::expressions::BaseExpression const> BaseExprPtr;
class ResultType {

2
src/storm/storage/jani/FunctionEliminator.cpp

@ -26,6 +26,8 @@ namespace storm {
class FunctionEliminationExpressionVisitor : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
typedef std::shared_ptr<storm::expressions::BaseExpression const> BaseExprPtr;

1
src/storm/storage/jani/JSONExporter.h

@ -17,6 +17,7 @@ namespace storm {
class ExpressionToJson : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
static ExportJsonType translate(storm::expressions::Expression const& expr, std::vector<storm::jani::Constant> const& constants, VariableSet const& globalVariables, VariableSet const& localVariables, std::unordered_set<std::string> const& auxiliaryVariables);
virtual boost::any visit(storm::expressions::IfThenElseExpression const& expression, boost::any const& data);

2
src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp

@ -11,6 +11,8 @@ namespace storm {
namespace detail {
class ArrayExpressionFinderExpressionVisitor : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
virtual boost::any visit(storm::expressions::IfThenElseExpression const& expression, boost::any const& data) override {
return
boost::any_cast<bool>(expression.getCondition()->accept(*this, data)) ||

1
src/storm/storage/jani/traverser/FunctionCallExpressionFinder.cpp

@ -11,6 +11,7 @@ namespace storm {
namespace detail {
class FunctionCallExpressionFinderExpressionVisitor : public storm::expressions::ExpressionVisitor, public storm::expressions::JaniExpressionVisitor {
public:
using storm::expressions::ExpressionVisitor::visit;
virtual boost::any visit(storm::expressions::IfThenElseExpression const& expression, boost::any const& data) override {
expression.getCondition()->accept(*this, data);
expression.getThenExpression()->accept(*this, data);

Loading…
Cancel
Save