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 1

Fixing merge relicts.

Browse source
This commit is contained in:
Robin Sommer 2012-07-02 16:11:42 -07:00
parent ef3da87b3f
commit ff73f3a040
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/input/ReaderFrontend.h
View file

@ -128,7 +128,7 @@ protected:
/**
* Sets the name of the backend's type.
*/
void SetTypeName(const string& name) const { ty_name = name; }
void SetTypeName(const string& name) { ty_name = name; }
private:
ReaderBackend* backend; // The backend we have instanatiated.

2
src/logging/WriterFrontend.cc
View file

@ -21,7 +21,7 @@ public:
info(info), num_fields(num_fields), fields(fields),
frontend_name(frontend_name) { }
virtual bool Process() { return Object()->Init(info, num_fields, fields); }
virtual bool Process() { return Object()->Init(info, num_fields, fields, frontend_name); }
private:
WriterBackend::WriterInfo info;