Mark one-parameter constructors as explicit & use override where possible

This commit marks (hopefully) ever one-parameter constructor as explicit.

It also uses override in (hopefully) all circumstances where a virtual
method is overridden.

There are a very few other minor changes - most of them were necessary
to get everything to compile (like one additional constructor). In one
case I changed an implicit operation to an explicit string conversion -
I think the automatically chosen conversion was much more convoluted.

This took longer than I want to admit but not as long as I feared :)
This commit is contained in:
Johanna Amann 2018-03-16 22:14:22 -07:00
parent 1f2bf50b49
commit 6d612ced3d
173 changed files with 1052 additions and 1046 deletions

View file

@ -27,8 +27,8 @@ typedef PList(NFA_State) NFA_state_list;
class NFA_State : public BroObj {
public:
NFA_State(int sym, EquivClass* ec);
NFA_State(CCL* ccl);
~NFA_State();
explicit NFA_State(CCL* ccl);
~NFA_State() override;
void AddXtion(NFA_State* next_state) { xtions.append(next_state); }
NFA_state_list* Transitions() { return &xtions; }
@ -52,7 +52,7 @@ public:
NFA_state_list* EpsilonClosure();
void Describe(ODesc* d) const;
void Describe(ODesc* d) const override;
void Dump(FILE* f);
// Recursivly count all the reachable states.
@ -75,8 +75,8 @@ public:
class NFA_Machine : public BroObj {
public:
NFA_Machine(NFA_State* first, NFA_State* final = 0);
~NFA_Machine();
explicit NFA_Machine(NFA_State* first, NFA_State* final = 0);
~NFA_Machine() override;
NFA_State* FirstState() const { return first_state; }
@ -103,7 +103,7 @@ public:
void AppendState(NFA_State* new_state);
void AppendMachine(NFA_Machine* new_mach);
void Describe(ODesc* d) const;
void Describe(ODesc* d) const override;
void Dump(FILE* f);
unsigned int MemoryAllocation() const