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

Merge remote-tracking branch 'origin/master' into topic/seth/faf-updates

Browse source 
Conflicts:
	magic
This commit is contained in:
Seth Hall 2013-07-16 12:09:53 -04:00
commit 7838113dc2
13 changed files with 2910 additions and 451 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/file_analysis/Component.cc
View file

@ -41,7 +41,7 @@ analyzer::Tag Component::Tag() const
return tag;
}
void Component::Describe(ODesc* d)
void Component::Describe(ODesc* d) const
{
plugin::Component::Describe(d);
d->Add(name);

2
src/file_analysis/Component.h
View file

@ -90,7 +90,7 @@ public:
* Generates a human-readable description of the component's main
* parameters. This goes into the output of \c "bro -NN".
*/
virtual void Describe(ODesc* d);
virtual void Describe(ODesc* d) const;
Component& operator=(const Component& other);