Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

12
src/threading/Manager.h
View file

@ -33,7 +33,7 @@ public:
/**
* Destructir.
*/
~Manager();
~Manager() override;
/**
* Terminates the manager's processor. The method signals all threads
@ -103,23 +103,23 @@ protected:
/**
* Part of the IOSource interface.
*/
virtual void GetFds(iosource::FD_Set* read, iosource::FD_Set* write,
iosource::FD_Set* except);
void GetFds(iosource::FD_Set* read, iosource::FD_Set* write,
iosource::FD_Set* except) override;
/**
* Part of the IOSource interface.
*/
virtual double NextTimestamp(double* network_time);
double NextTimestamp(double* network_time) override;
/**
* Part of the IOSource interface.
*/
virtual void Process();
void Process() override;
/**
* Part of the IOSource interface.
*/
virtual const char* Tag() { return "threading::Manager"; }
const char* Tag() override { return "threading::Manager"; }
private:
typedef std::list<BasicThread*> all_thread_list;

6
src/threading/MsgThread.h
View file

@ -339,7 +339,7 @@ protected:
* @param arg_name A descriptive name for the type of message. Used
* mainly for debugging purposes.
*/
Message(const char* arg_name)
explicit Message(const char* arg_name)
{ name = copy_string(arg_name); }
private:
@ -358,7 +358,7 @@ protected:
* @param name A descriptive name for the type of message. Used
* mainly for debugging purposes.
*/
BasicInputMessage(const char* name) : Message(name) {}
explicit BasicInputMessage(const char* name) : Message(name) {}
};
/**
@ -373,7 +373,7 @@ protected:
* @param name A descriptive name for the type of message. Used
* mainly for debugging purposes.
*/
BasicOutputMessage(const char* name) : Message(name) {}
explicit BasicOutputMessage(const char* name) : Message(name) {}
};
/**

10
src/threading/formatters/JSON.h
View file

@ -20,12 +20,12 @@ public:
};
JSON(threading::MsgThread* t, TimeFormat tf);
virtual ~JSON();
~JSON() override;
virtual bool Describe(ODesc* desc, threading::Value* val, const string& name = "") const;
virtual bool Describe(ODesc* desc, int num_fields, const threading::Field* const * fields,
threading::Value** vals) const;
virtual threading::Value* ParseValue(const string& s, const string& name, TypeTag type, TypeTag subtype = TYPE_ERROR) const;
bool Describe(ODesc* desc, threading::Value* val, const string& name = "") const override;
bool Describe(ODesc* desc, int num_fields, const threading::Field* const * fields,
threading::Value** vals) const override;
threading::Value* ParseValue(const string& s, const string& name, TypeTag type, TypeTag subtype = TYPE_ERROR) const override;
void SurroundingBraces(bool use_braces);