Skip to content

Commit

Permalink
Use = default for virtual constructors.
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys authored and NikolajBjorner committed Aug 5, 2022
1 parent aa0719a commit 5014b1a
Show file tree
Hide file tree
Showing 85 changed files with 106 additions and 107 deletions.
2 changes: 1 addition & 1 deletion src/api/api_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace api {
context& m_context;
public:
object(context& c);
virtual ~object() {}
virtual ~object() = default;
unsigned ref_count() const { return m_ref_count; }
unsigned id() const { return m_id; }
void inc_ref();
Expand Down
2 changes: 1 addition & 1 deletion src/api/c++/z3++.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace z3 {
class exception : public std::exception {
std::string m_msg;
public:
virtual ~exception() throw() {}
virtual ~exception() throw() = default;
exception(char const * msg):m_msg(msg) {}
char const * msg() const { return m_msg.c_str(); }
char const * what() const throw() { return m_msg.c_str(); }
Expand Down
4 changes: 2 additions & 2 deletions src/ast/ast.h
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ class decl_plugin {
friend class ast_manager;

public:
virtual ~decl_plugin() {}
virtual ~decl_plugin() = default;
virtual void finalize() {}


Expand Down Expand Up @@ -2582,7 +2582,7 @@ class ast_mark {
obj_mark<expr> m_expr_marks;
obj_mark<decl, bit_vector, decl2uint> m_decl_marks;
public:
virtual ~ast_mark() {}
virtual ~ast_mark() = default;
bool is_marked(ast * n) const;
virtual void mark(ast * n, bool flag);
virtual void reset();
Expand Down
2 changes: 1 addition & 1 deletion src/ast/ast_printer.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Revision History:

class ast_printer {
public:
virtual ~ast_printer() {}
virtual ~ast_printer() = default;
virtual void pp(sort * s, format_ns::format_ref & r) const { UNREACHABLE(); }
virtual void pp(func_decl * f, format_ns::format_ref & r) const { UNREACHABLE(); }
virtual void pp(expr * n, unsigned num_vars, char const * var_prefix, format_ns::format_ref & r, sbuffer<symbol> & var_names) const { UNREACHABLE(); }
Expand Down
2 changes: 1 addition & 1 deletion src/ast/ast_smt2_pp.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class smt2_pp_environment {
format_ns::format * pp_as(format_ns::format * fname, sort * s);
format_ns::format * pp_signature(format_ns::format * f_name, func_decl * f);
public:
virtual ~smt2_pp_environment() {}
virtual ~smt2_pp_environment() = default;
virtual ast_manager & get_manager() const = 0;
virtual arith_util & get_autil() = 0;
virtual bv_util & get_bvutil() = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ast/datatype_decl_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace datatype {
class size {
unsigned m_ref{ 0 };
public:
virtual ~size() { }
virtual ~size() = default;
void inc_ref() { ++m_ref; }
void dec_ref();
static size* mk_offset(sort_size const& s);
Expand Down
4 changes: 2 additions & 2 deletions src/ast/expr_functors.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ Revision History:
class i_expr_pred {
public:
virtual bool operator()(expr* e) = 0;
virtual ~i_expr_pred() {}
virtual ~i_expr_pred() = default;
};


class i_sort_pred {
public:
virtual bool operator()(sort* s) = 0;
virtual ~i_sort_pred() {}
virtual ~i_sort_pred() = default;
};


Expand Down
2 changes: 1 addition & 1 deletion src/ast/macros/quantifier_macro_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class quantifier_macro_info {
void collect_macro_candidates(quantifier* q);
public:
quantifier_macro_info(ast_manager& m, quantifier* q);
virtual ~quantifier_macro_info() {}
virtual ~quantifier_macro_info() = default;
bool is_auf() const { return m_is_auf; }
quantifier* get_flat_q() const { return m_flat_q; }
bool has_cond_macros() const { return !m_cond_macros.empty(); }
Expand Down
2 changes: 1 addition & 1 deletion src/ast/normal_forms/elim_term_ite.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class elim_term_ite_cfg : public default_rewriter_cfg {
elim_term_ite_cfg(ast_manager & m, defined_names & d): m(m), m_defined_names(d) {
// TBD enable_ac_support(false);
}
virtual ~elim_term_ite_cfg() {}
virtual ~elim_term_ite_cfg() = default;
vector<justified_expr> const& new_defs() const { return m_new_defs; }
br_status reduce_app(func_decl* f, unsigned n, expr *const* args, expr_ref& result, proof_ref& result_pr);
void push() { m_lim.push_back(m_new_defs.size()); }
Expand Down
2 changes: 1 addition & 1 deletion src/ast/normal_forms/name_exprs.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class expr_predicate {

class name_exprs {
public:
virtual ~name_exprs() {}
virtual ~name_exprs() = default;
virtual void operator()(expr * n, // [IN] expression that contain the sub-expressions to be named
expr_ref_vector & new_defs, // [OUT] new definitions
proof_ref_vector & new_def_proofs, // [OUT] proofs of the new definitions
Expand Down
2 changes: 1 addition & 1 deletion src/ast/recfun_decl_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace recfun {

class replace {
public:
virtual ~replace() {}
virtual ~replace() = default;
virtual void reset() = 0;
virtual void insert(expr* d, expr* r) = 0;
virtual expr_ref operator()(expr* e) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ast/rewriter/expr_replacer.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Module Name:
class expr_replacer {
struct scoped_set_subst;
public:
virtual ~expr_replacer() {}
virtual ~expr_replacer() = default;

virtual ast_manager & m() const = 0;
virtual void set_substitution(expr_substitution * s) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ast/rewriter/seq_rewriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class sym_expr_manager {

class expr_solver {
public:
virtual ~expr_solver() {}
virtual ~expr_solver() = default;
virtual lbool check_sat(expr* e) = 0;
};

Expand Down
2 changes: 1 addition & 1 deletion src/ast/substitution/substitution_tree.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class st_visitor {
substitution & m_subst;
public:
st_visitor(substitution & s):m_subst(s) {}
virtual ~st_visitor() {}
virtual ~st_visitor() = default;
substitution & get_substitution() { return m_subst; }
virtual bool operator()(expr * e) { return true; }
};
Expand Down
2 changes: 1 addition & 1 deletion src/ast/value_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

class value_generator_core {
public:
virtual ~value_generator_core() {}
virtual ~value_generator_core() = default;
virtual family_id get_fid() const = 0;
virtual expr_ref get_value(sort* s, unsigned index) = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion src/cmd_context/cmd_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class macro_decls {
class object_ref {
unsigned m_ref_count = 0;
public:
virtual ~object_ref() {}
virtual ~object_ref() = default;
virtual void finalize(cmd_context & ctx) = 0;
void inc_ref(cmd_context & ctx) {
m_ref_count++;
Expand Down
2 changes: 1 addition & 1 deletion src/cmd_context/pdecl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ struct pdecl_manager::sort_info {
m_decl(d) {
m.inc_ref(d);
}
virtual ~sort_info() {}
virtual ~sort_info() = default;
virtual unsigned obj_size() const { return sizeof(sort_info); }
virtual void finalize(pdecl_manager & m) { m.dec_ref(m_decl); }
virtual void display(std::ostream & out, pdecl_manager const & m) const = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/cmd_context/pdecl.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class pdecl {
virtual size_t obj_size() const { UNREACHABLE(); return sizeof(*this); }
pdecl(unsigned id, unsigned num_params):m_id(id), m_num_params(num_params), m_ref_count(0) {}
virtual void finalize(pdecl_manager & m) {}
virtual ~pdecl() {}
virtual ~pdecl() = default;
public:
virtual bool check_num_params(pdecl * other) const { return m_num_params == other->m_num_params; }
unsigned get_num_params() const { return m_num_params; }
Expand Down Expand Up @@ -257,7 +257,7 @@ class pdatatypes_decl : public pdecl {

class new_datatype_eh {
public:
virtual ~new_datatype_eh() {}
virtual ~new_datatype_eh() = default;
virtual void operator()(sort * dt, pdecl* pd) = 0;
};

Expand Down
2 changes: 1 addition & 1 deletion src/math/automata/boolean_algebra.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Revision History:
template<class T>
class positive_boolean_algebra {
public:
virtual ~positive_boolean_algebra() {}
virtual ~positive_boolean_algebra() = default;
virtual T mk_false() = 0;
virtual T mk_true() = 0;
virtual T mk_and(T x, T y) = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/math/hilbert/heap_trie.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class heap_trie {
unsigned m_ref;
public:
node(node_t t): m_type(t), m_ref(0) {}
virtual ~node() {}
virtual ~node() = default;
node_t type() const { return m_type; }
void inc_ref() { ++m_ref; }
void dec_ref() { SASSERT(m_ref > 0); --m_ref; }
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/lar_constraints.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class lar_base_constraint {

virtual vector<std::pair<mpq, var_index>> coeffs() const = 0;
lar_base_constraint(unsigned j, lconstraint_kind kind, const mpq& right_side) :m_kind(kind), m_right_side(right_side), m_active(false), m_j(j) {}
virtual ~lar_base_constraint() {}
virtual ~lar_base_constraint() = default;

lconstraint_kind kind() const { return m_kind; }
mpq const& rhs() const { return m_right_side; }
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/lp_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace lp_api {
m_constraints[1] = ct;
}

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

theory_var get_var() const { return m_var; }

Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class matrix {
virtual void set_number_of_rows(unsigned m) = 0;
virtual void set_number_of_columns(unsigned n) = 0;

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

bool is_equal(const matrix<T, X>& other);
bool operator == (matrix<T, X> const & other) {
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/nex.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class nex {
bool is_scalar() const { return type() == expr_type::SCALAR; }
virtual bool is_pure_monomial() const { return false; }
std::string str() const { std::stringstream ss; print(ss); return ss.str(); }
virtual ~nex() {}
virtual ~nex() = default;
virtual bool contains(lpvar j) const { return false; }
virtual unsigned get_degree() const = 0;
// simplifies the expression and also assigns the address of "this" to *e
Expand Down
2 changes: 1 addition & 1 deletion src/math/lp/tail_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class tail_matrix
virtual void apply_from_left(vector<X> & w, lp_settings & settings) = 0;
virtual void apply_from_right(vector<T> & w) = 0;
virtual void apply_from_right(indexed_vector<T> & w) = 0;
virtual ~tail_matrix() {}
virtual ~tail_matrix() = default;
virtual bool is_dense() const = 0;
struct ref_row {
const tail_matrix & m_A;
Expand Down
2 changes: 1 addition & 1 deletion src/math/simplex/network_flow.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace smt {
m_states(states),
m_enter_id(enter_id) {
}
virtual ~pivot_rule_impl() {}
virtual ~pivot_rule_impl() = default;
virtual bool choose_entering_edge() = 0;
virtual pivot_rule rule() const = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion src/math/subpaving/subpaving.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace subpaving {

class context {
public:
virtual ~context() {}
virtual ~context() = default;

virtual unsynch_mpq_manager & qm() const = 0;

Expand Down
6 changes: 3 additions & 3 deletions src/math/subpaving/subpaving_t.h
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ class context_t {
context_t * m_ctx;
public:
node_selector(context_t * ctx):m_ctx(ctx) {}
virtual ~node_selector() {}
virtual ~node_selector() = default;

context_t * ctx() const { return m_ctx; }

Expand All @@ -403,7 +403,7 @@ class context_t {
context_t * m_ctx;
public:
var_selector(context_t * ctx):m_ctx(ctx) {}
virtual ~var_selector() {}
virtual ~var_selector() = default;

context_t * ctx() const { return m_ctx; }

Expand Down Expand Up @@ -436,7 +436,7 @@ class context_t {
context_t * m_ctx;
public:
node_splitter(context_t * ctx):m_ctx(ctx) {}
virtual ~node_splitter() {}
virtual ~node_splitter() = default;

context_t * ctx() const { return m_ctx; }
node * mk_node(node * p) { return ctx()->mk_node(p); }
Expand Down
4 changes: 2 additions & 2 deletions src/model/model_macro_solver.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Copyright (c) 2006 Microsoft Corporation

class quantifier2macro_infos {
public:
virtual ~quantifier2macro_infos() {}
virtual ~quantifier2macro_infos() = default;
virtual quantifier_macro_info* operator()(quantifier* q) = 0;
};

Expand Down Expand Up @@ -48,7 +48,7 @@ class base_macro_solver {
m_model(nullptr) {
}

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

/**
\brief Try to satisfy quantifiers in qs by using macro definitions.
Expand Down
2 changes: 1 addition & 1 deletion src/muz/base/dl_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace datalog {
m_limited_size = ctx.get_decl_util().try_get_size(s, m_size);
}
public:
virtual ~sort_domain() {}
virtual ~sort_domain() = default;

sort_kind get_kind() const { return m_kind; }
virtual unsigned get_constant_count() const = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/muz/base/dl_engine_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace datalog {
std::string m_name;
public:
engine_base(ast_manager& m, char const* name): m(m), m_name(name) {}
virtual ~engine_base() {}
virtual ~engine_base() = default;

virtual expr_ref get_answer() = 0;
virtual expr_ref get_ground_sat_answer () {
Expand Down
2 changes: 1 addition & 1 deletion src/muz/base/dl_rule_transformer.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ namespace datalog {
m_can_destratify_negation(can_destratify_negation), m_transformer(nullptr) {}

public:
virtual ~plugin() {}
virtual ~plugin() = default;

unsigned get_priority() { return m_priority; }
bool can_destratify_negation() const { return m_can_destratify_negation; }
Expand Down
4 changes: 2 additions & 2 deletions src/muz/fp/datalog_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace datalog {
public:
static parser * create(context& ctx, ast_manager & ast_manager);

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

virtual bool parse_file(char const * path) = 0;
virtual bool parse_string(char const * string) = 0;
Expand All @@ -37,7 +37,7 @@ namespace datalog {
public:
static wpa_parser * create(context& ctx, ast_manager & ast_manager);

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

virtual bool parse_directory(char const * path) = 0;
};
Expand Down
Loading

0 comments on commit 5014b1a

Please sign in to comment.