Skip to content

Commit

Permalink
Remove virtual keyword where not needed
Browse files Browse the repository at this point in the history
No need to declare method virtual when it is already marked override.
  • Loading branch information
romainbrenguier committed Apr 23, 2018
1 parent 990f33e commit 7db44fc
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/solvers/flattening/boolbv.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class boolbvt:public arrayst
boolbv_mapt map;

// overloading
virtual literalt convert_rest(const exprt &expr) override;
literalt convert_rest(const exprt &expr) override;
virtual bool boolbv_set_equality_to_true(const equal_exprt &expr);

// NOLINTNEXTLINE(readability/identifiers)
Expand Down
32 changes: 19 additions & 13 deletions src/solvers/prop/prop_conv.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,35 @@ class prop_conv_solvert:public prop_convt
prop_convt(_ns),
prop(_prop) { }

virtual ~prop_conv_solvert() { }
virtual ~prop_conv_solvert() = default;

// overloading from decision_proceduret
virtual void set_to(const exprt &expr, bool value) override;
virtual decision_proceduret::resultt dec_solve() override;
virtual void print_assignment(std::ostream &out) const override;
virtual std::string decision_procedure_text() const override
void set_to(const exprt &expr, bool value) override;
decision_proceduret::resultt dec_solve() override;
void print_assignment(std::ostream &out) const override;
std::string decision_procedure_text() const override
{ return "propositional reduction"; }
virtual exprt get(const exprt &expr) const override;
exprt get(const exprt &expr) const override;

// overloading from prop_convt
using prop_convt::set_frozen;
virtual tvt l_get(literalt a) const override { return prop.l_get(a); }
virtual void set_frozen(literalt a) override { prop.set_frozen(a); }
virtual void set_assumptions(const bvt &_assumptions) override
void set_frozen(literalt a) override
{
prop.set_frozen(a);
}
void set_assumptions(const bvt &_assumptions) override
{ prop.set_assumptions(_assumptions); }
virtual bool has_set_assumptions() const override
bool has_set_assumptions() const override
{ return prop.has_set_assumptions(); }
virtual void set_all_frozen() override { freeze_all = true; }
virtual literalt convert(const exprt &expr) override;
virtual bool is_in_conflict(literalt l) const override
void set_all_frozen() override
{
freeze_all = true;
}
literalt convert(const exprt &expr) override;
bool is_in_conflict(literalt l) const override
{ return prop.is_in_conflict(l); }
virtual bool has_is_in_conflict() const override
bool has_is_in_conflict() const override
{ return prop.has_is_in_conflict(); }

// get literal for expression, if available
Expand Down

0 comments on commit 7db44fc

Please sign in to comment.