Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 09:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

27
src/OpaqueVal.h
View file

@ -23,7 +23,8 @@ public:
protected:
HashVal() { };
HashVal(OpaqueType* t);
explicit HashVal(OpaqueType* t);
virtual bool DoInit();
virtual bool DoFeed(const void* data, size_t size);
virtual StringVal* DoGet();
@ -48,9 +49,9 @@ public:
protected:
friend class Val;
virtual bool DoInit() override;
virtual bool DoFeed(const void* data, size_t size) override;
virtual StringVal* DoGet() override;
bool DoInit() override;
bool DoFeed(const void* data, size_t size) override;
StringVal* DoGet() override;
DECLARE_SERIAL(MD5Val);
@ -67,9 +68,9 @@ public:
protected:
friend class Val;
virtual bool DoInit() override;
virtual bool DoFeed(const void* data, size_t size) override;
virtual StringVal* DoGet() override;
bool DoInit() override;
bool DoFeed(const void* data, size_t size) override;
StringVal* DoGet() override;
DECLARE_SERIAL(SHA1Val);
@ -86,9 +87,9 @@ public:
protected:
friend class Val;
virtual bool DoInit() override;
virtual bool DoFeed(const void* data, size_t size) override;
virtual StringVal* DoGet() override;
bool DoInit() override;
bool DoFeed(const void* data, size_t size) override;
StringVal* DoGet() override;
DECLARE_SERIAL(SHA256Val);
@ -116,7 +117,7 @@ private:
class BloomFilterVal : public OpaqueVal {
public:
explicit BloomFilterVal(probabilistic::BloomFilter* bf);
virtual ~BloomFilterVal();
~BloomFilterVal() override;
BroType* Type() const;
bool Typify(BroType* type);
@ -133,7 +134,7 @@ public:
protected:
friend class Val;
BloomFilterVal();
BloomFilterVal(OpaqueType* t);
explicit BloomFilterVal(OpaqueType* t);
DECLARE_SERIAL(BloomFilterVal);
@ -151,7 +152,7 @@ private:
class CardinalityVal: public OpaqueVal {
public:
explicit CardinalityVal(probabilistic::CardinalityCounter*);
virtual ~CardinalityVal();
~CardinalityVal() override;
void Add(const Val* val);