mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 23:58:20 +00:00
Add missing override specifier to a number of methods, remove virtual from some as well
This commit is contained in:
parent
6aaabceed2
commit
186005133b
9 changed files with 42 additions and 43 deletions
|
@ -421,8 +421,8 @@ public:
|
||||||
OuterIDBindingFinder(Scope* s)
|
OuterIDBindingFinder(Scope* s)
|
||||||
: scope(s) { }
|
: scope(s) { }
|
||||||
|
|
||||||
virtual TraversalCode PreExpr(const Expr*);
|
TraversalCode PreExpr(const Expr*) override;
|
||||||
virtual TraversalCode PostExpr(const Expr*);
|
TraversalCode PostExpr(const Expr*) override;
|
||||||
|
|
||||||
Scope* scope;
|
Scope* scope;
|
||||||
vector<const NameExpr*> outer_id_references;
|
vector<const NameExpr*> outer_id_references;
|
||||||
|
|
|
@ -176,7 +176,7 @@ void HTTP_Entity::Deliver(int len, const char* data, int trailing_CRLF)
|
||||||
class HTTP_Entity::UncompressedOutput : public analyzer::OutputHandler {
|
class HTTP_Entity::UncompressedOutput : public analyzer::OutputHandler {
|
||||||
public:
|
public:
|
||||||
UncompressedOutput(HTTP_Entity* e) { entity = e; }
|
UncompressedOutput(HTTP_Entity* e) { entity = e; }
|
||||||
virtual void DeliverStream(int len, const u_char* data, bool orig)
|
void DeliverStream(int len, const u_char* data, bool orig) override
|
||||||
{
|
{
|
||||||
entity->DeliverBodyClear(len, (char*) data, false);
|
entity->DeliverBodyClear(len, (char*) data, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -113,7 +113,7 @@ public:
|
||||||
EventHandlerPtr event;
|
EventHandlerPtr event;
|
||||||
|
|
||||||
TableStream();
|
TableStream();
|
||||||
~TableStream();
|
~TableStream() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Manager::EventStream: public Manager::Stream {
|
class Manager::EventStream: public Manager::Stream {
|
||||||
|
@ -125,7 +125,7 @@ public:
|
||||||
|
|
||||||
bool want_record;
|
bool want_record;
|
||||||
EventStream();
|
EventStream();
|
||||||
~EventStream();
|
~EventStream() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Manager::AnalysisStream: public Manager::Stream {
|
class Manager::AnalysisStream: public Manager::Stream {
|
||||||
|
@ -133,7 +133,7 @@ public:
|
||||||
string file_id;
|
string file_id;
|
||||||
|
|
||||||
AnalysisStream();
|
AnalysisStream();
|
||||||
~AnalysisStream();
|
~AnalysisStream() override;
|
||||||
};
|
};
|
||||||
|
|
||||||
Manager::TableStream::TableStream()
|
Manager::TableStream::TableStream()
|
||||||
|
|
|
@ -15,7 +15,7 @@ public:
|
||||||
: threading::OutputMessage<ReaderFrontend>("Put", reader),
|
: threading::OutputMessage<ReaderFrontend>("Put", reader),
|
||||||
val(val) {}
|
val(val) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
input_mgr->Put(Object(), val);
|
input_mgr->Put(Object(), val);
|
||||||
return true;
|
return true;
|
||||||
|
@ -31,7 +31,7 @@ public:
|
||||||
: threading::OutputMessage<ReaderFrontend>("Delete", reader),
|
: threading::OutputMessage<ReaderFrontend>("Delete", reader),
|
||||||
val(val) {}
|
val(val) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
return input_mgr->Delete(Object(), val);
|
return input_mgr->Delete(Object(), val);
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ public:
|
||||||
ClearMessage(ReaderFrontend* reader)
|
ClearMessage(ReaderFrontend* reader)
|
||||||
: threading::OutputMessage<ReaderFrontend>("Clear", reader) {}
|
: threading::OutputMessage<ReaderFrontend>("Clear", reader) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
input_mgr->Clear(Object());
|
input_mgr->Clear(Object());
|
||||||
return true;
|
return true;
|
||||||
|
@ -60,9 +60,9 @@ public:
|
||||||
: threading::OutputMessage<ReaderFrontend>("SendEvent", reader),
|
: threading::OutputMessage<ReaderFrontend>("SendEvent", reader),
|
||||||
name(copy_string(name)), num_vals(num_vals), val(val) {}
|
name(copy_string(name)), num_vals(num_vals), val(val) {}
|
||||||
|
|
||||||
virtual ~SendEventMessage() { delete [] name; }
|
~SendEventMessage() override { delete [] name; }
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
bool success = input_mgr->SendEvent(Object(), name, num_vals, val);
|
bool success = input_mgr->SendEvent(Object(), name, num_vals, val);
|
||||||
|
|
||||||
|
@ -89,9 +89,9 @@ public:
|
||||||
: threading::OutputMessage<ReaderFrontend>("ReaderErrorMessage", reader)
|
: threading::OutputMessage<ReaderFrontend>("ReaderErrorMessage", reader)
|
||||||
{ type = arg_type; msg = copy_string(arg_msg); }
|
{ type = arg_type; msg = copy_string(arg_msg); }
|
||||||
|
|
||||||
virtual ~ReaderErrorMessage() { delete [] msg; }
|
~ReaderErrorMessage() override { delete [] msg; }
|
||||||
|
|
||||||
virtual bool Process();
|
bool Process() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char* msg;
|
const char* msg;
|
||||||
|
@ -104,7 +104,7 @@ public:
|
||||||
: threading::OutputMessage<ReaderFrontend>("SendEntry", reader),
|
: threading::OutputMessage<ReaderFrontend>("SendEntry", reader),
|
||||||
val(val) { }
|
val(val) { }
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
input_mgr->SendEntry(Object(), val);
|
input_mgr->SendEntry(Object(), val);
|
||||||
return true;
|
return true;
|
||||||
|
@ -119,7 +119,7 @@ public:
|
||||||
EndCurrentSendMessage(ReaderFrontend* reader)
|
EndCurrentSendMessage(ReaderFrontend* reader)
|
||||||
: threading::OutputMessage<ReaderFrontend>("EndCurrentSend", reader) {}
|
: threading::OutputMessage<ReaderFrontend>("EndCurrentSend", reader) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
input_mgr->EndCurrentSend(Object());
|
input_mgr->EndCurrentSend(Object());
|
||||||
return true;
|
return true;
|
||||||
|
@ -133,7 +133,7 @@ public:
|
||||||
EndOfDataMessage(ReaderFrontend* reader)
|
EndOfDataMessage(ReaderFrontend* reader)
|
||||||
: threading::OutputMessage<ReaderFrontend>("EndOfData", reader) {}
|
: threading::OutputMessage<ReaderFrontend>("EndOfData", reader) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
input_mgr->SendEndOfData(Object());
|
input_mgr->SendEndOfData(Object());
|
||||||
return true;
|
return true;
|
||||||
|
@ -147,7 +147,7 @@ public:
|
||||||
ReaderClosedMessage(ReaderFrontend* reader)
|
ReaderClosedMessage(ReaderFrontend* reader)
|
||||||
: threading::OutputMessage<ReaderFrontend>("ReaderClosed", reader) {}
|
: threading::OutputMessage<ReaderFrontend>("ReaderClosed", reader) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
Object()->SetDisable();
|
Object()->SetDisable();
|
||||||
return input_mgr->RemoveStreamContinuation(Object());
|
return input_mgr->RemoveStreamContinuation(Object());
|
||||||
|
@ -159,10 +159,10 @@ private:
|
||||||
class DisableMessage : public threading::OutputMessage<ReaderFrontend>
|
class DisableMessage : public threading::OutputMessage<ReaderFrontend>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DisableMessage(ReaderFrontend* writer)
|
DisableMessage(ReaderFrontend* writer)
|
||||||
: threading::OutputMessage<ReaderFrontend>("Disable", writer) {}
|
: threading::OutputMessage<ReaderFrontend>("Disable", writer) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
Object()->SetDisable();
|
Object()->SetDisable();
|
||||||
// And - because we do not need disabled objects any more -
|
// And - because we do not need disabled objects any more -
|
||||||
|
|
|
@ -14,7 +14,7 @@ public:
|
||||||
: threading::InputMessage<ReaderBackend>("Init", backend),
|
: threading::InputMessage<ReaderBackend>("Init", backend),
|
||||||
num_fields(num_fields), fields(fields) { }
|
num_fields(num_fields), fields(fields) { }
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
return Object()->Init(num_fields, fields);
|
return Object()->Init(num_fields, fields);
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ public:
|
||||||
: threading::InputMessage<ReaderBackend>("Update", backend)
|
: threading::InputMessage<ReaderBackend>("Update", backend)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
virtual bool Process() { return Object()->Update(); }
|
bool Process() override { return Object()->Update(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, EnumVal* type)
|
ReaderFrontend::ReaderFrontend(const ReaderBackend::ReaderInfo& arg_info, EnumVal* type)
|
||||||
|
@ -98,4 +98,3 @@ const char* ReaderFrontend::Name() const
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1399,9 +1399,9 @@ public:
|
||||||
rotate = arg_rotate;
|
rotate = arg_rotate;
|
||||||
}
|
}
|
||||||
|
|
||||||
~RotationTimer();
|
~RotationTimer() override;
|
||||||
|
|
||||||
void Dispatch(double t, int is_expire);
|
void Dispatch(double t, int is_expire) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Manager::WriterInfo* winfo;
|
Manager::WriterInfo* winfo;
|
||||||
|
|
|
@ -25,13 +25,13 @@ public:
|
||||||
new_name(copy_string(new_name)), old_name(copy_string(old_name)), open(open),
|
new_name(copy_string(new_name)), old_name(copy_string(old_name)), open(open),
|
||||||
close(close), success(success), terminating(terminating) { }
|
close(close), success(success), terminating(terminating) { }
|
||||||
|
|
||||||
virtual ~RotationFinishedMessage()
|
~RotationFinishedMessage() override
|
||||||
{
|
{
|
||||||
delete [] new_name;
|
delete [] new_name;
|
||||||
delete [] old_name;
|
delete [] old_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
return log_mgr->FinishedRotation(Object(), new_name, old_name, open, close, success, terminating);
|
return log_mgr->FinishedRotation(Object(), new_name, old_name, open, close, success, terminating);
|
||||||
}
|
}
|
||||||
|
@ -48,19 +48,19 @@ private:
|
||||||
class FlushWriteBufferMessage : public threading::OutputMessage<WriterFrontend>
|
class FlushWriteBufferMessage : public threading::OutputMessage<WriterFrontend>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FlushWriteBufferMessage(WriterFrontend* writer)
|
FlushWriteBufferMessage(WriterFrontend* writer)
|
||||||
: threading::OutputMessage<WriterFrontend>("FlushWriteBuffer", writer) {}
|
: threading::OutputMessage<WriterFrontend>("FlushWriteBuffer", writer) {}
|
||||||
|
|
||||||
virtual bool Process() { Object()->FlushWriteBuffer(); return true; }
|
bool Process() override { Object()->FlushWriteBuffer(); return true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class DisableMessage : public threading::OutputMessage<WriterFrontend>
|
class DisableMessage : public threading::OutputMessage<WriterFrontend>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
DisableMessage(WriterFrontend* writer)
|
DisableMessage(WriterFrontend* writer)
|
||||||
: threading::OutputMessage<WriterFrontend>("Disable", writer) {}
|
: threading::OutputMessage<WriterFrontend>("Disable", writer) {}
|
||||||
|
|
||||||
virtual bool Process() { Object()->SetDisable(); return true; }
|
bool Process() override { Object()->SetDisable(); return true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ public:
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
virtual bool Process() { return Object()->Init(num_fields, fields); }
|
bool Process() override { return Object()->Init(num_fields, fields); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const int num_fields;
|
const int num_fields;
|
||||||
|
@ -42,7 +42,7 @@ public:
|
||||||
|
|
||||||
virtual ~RotateMessage() { delete [] rotated_path; }
|
virtual ~RotateMessage() { delete [] rotated_path; }
|
||||||
|
|
||||||
virtual bool Process() { return Object()->Rotate(rotated_path, open, close, terminating); }
|
bool Process() override { return Object()->Rotate(rotated_path, open, close, terminating); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
WriterFrontend* frontend;
|
WriterFrontend* frontend;
|
||||||
|
@ -59,7 +59,7 @@ public:
|
||||||
: threading::InputMessage<WriterBackend>("Write", backend),
|
: threading::InputMessage<WriterBackend>("Write", backend),
|
||||||
num_fields(num_fields), num_writes(num_writes), vals(vals) {}
|
num_fields(num_fields), num_writes(num_writes), vals(vals) {}
|
||||||
|
|
||||||
virtual bool Process() { return Object()->Write(num_fields, num_writes, vals); }
|
bool Process() override { return Object()->Write(num_fields, num_writes, vals); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int num_fields;
|
int num_fields;
|
||||||
|
@ -74,7 +74,7 @@ public:
|
||||||
: threading::InputMessage<WriterBackend>("SetBuf", backend),
|
: threading::InputMessage<WriterBackend>("SetBuf", backend),
|
||||||
enabled(enabled) { }
|
enabled(enabled) { }
|
||||||
|
|
||||||
virtual bool Process() { return Object()->SetBuf(enabled); }
|
bool Process() override { return Object()->SetBuf(enabled); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const bool enabled;
|
const bool enabled;
|
||||||
|
@ -87,7 +87,7 @@ public:
|
||||||
: threading::InputMessage<WriterBackend>("Flush", backend),
|
: threading::InputMessage<WriterBackend>("Flush", backend),
|
||||||
network_time(network_time) {}
|
network_time(network_time) {}
|
||||||
|
|
||||||
virtual bool Process() { return Object()->Flush(network_time); }
|
bool Process() override { return Object()->Flush(network_time); }
|
||||||
private:
|
private:
|
||||||
double network_time;
|
double network_time;
|
||||||
};
|
};
|
||||||
|
|
|
@ -21,7 +21,7 @@ public:
|
||||||
FinishMessage(MsgThread* thread, double network_time) : InputMessage<MsgThread>("Finish", thread),
|
FinishMessage(MsgThread* thread, double network_time) : InputMessage<MsgThread>("Finish", thread),
|
||||||
network_time(network_time) { }
|
network_time(network_time) { }
|
||||||
|
|
||||||
virtual bool Process() {
|
bool Process() override {
|
||||||
if ( Object()->child_finished )
|
if ( Object()->child_finished )
|
||||||
return true;
|
return true;
|
||||||
bool result = Object()->OnFinish(network_time);
|
bool result = Object()->OnFinish(network_time);
|
||||||
|
@ -41,7 +41,7 @@ public:
|
||||||
: OutputMessage<MsgThread>("FinishedMessage", thread)
|
: OutputMessage<MsgThread>("FinishedMessage", thread)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
virtual bool Process() {
|
bool Process() override {
|
||||||
Object()->main_finished = true;
|
Object()->main_finished = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ public:
|
||||||
: InputMessage<MsgThread>("Heartbeat", thread)
|
: InputMessage<MsgThread>("Heartbeat", thread)
|
||||||
{ network_time = arg_network_time; current_time = arg_current_time; }
|
{ network_time = arg_network_time; current_time = arg_current_time; }
|
||||||
|
|
||||||
virtual bool Process() {
|
bool Process() override {
|
||||||
return Object()->OnHeartbeat(network_time, current_time);
|
return Object()->OnHeartbeat(network_time, current_time);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,9 +77,9 @@ public:
|
||||||
: OutputMessage<MsgThread>("ReporterMessage", thread)
|
: OutputMessage<MsgThread>("ReporterMessage", thread)
|
||||||
{ type = arg_type; msg = copy_string(arg_msg); }
|
{ type = arg_type; msg = copy_string(arg_msg); }
|
||||||
|
|
||||||
~ReporterMessage() { delete [] msg; }
|
~ReporterMessage() override { delete [] msg; }
|
||||||
|
|
||||||
virtual bool Process();
|
bool Process() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char* msg;
|
const char* msg;
|
||||||
|
@ -93,7 +93,7 @@ public:
|
||||||
KillMeMessage(MsgThread* thread)
|
KillMeMessage(MsgThread* thread)
|
||||||
: OutputMessage<MsgThread>("ReporterMessage", thread) {}
|
: OutputMessage<MsgThread>("ReporterMessage", thread) {}
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
Object()->SignalStop();
|
Object()->SignalStop();
|
||||||
Object()->WaitForStop();
|
Object()->WaitForStop();
|
||||||
|
@ -111,9 +111,9 @@ public:
|
||||||
: OutputMessage<MsgThread>("DebugMessage", thread)
|
: OutputMessage<MsgThread>("DebugMessage", thread)
|
||||||
{ stream = arg_stream; msg = copy_string(arg_msg); }
|
{ stream = arg_stream; msg = copy_string(arg_msg); }
|
||||||
|
|
||||||
virtual ~DebugMessage() { delete [] msg; }
|
~DebugMessage() override { delete [] msg; }
|
||||||
|
|
||||||
virtual bool Process()
|
bool Process() override
|
||||||
{
|
{
|
||||||
debug_logger.Log(stream, "%s: %s", Object()->Name(), msg);
|
debug_logger.Log(stream, "%s: %s", Object()->Name(), msg);
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue