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

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-deprecated-functions-events

Browse source
This commit is contained in:
Johanna Amann 2019-05-03 15:15:22 -07:00
commit 4c19e60488
90 changed files with 719 additions and 580 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ID.cc
View file

@ -12,7 +12,7 @@
#include "Serializer.h"
#include "Scope.h"
#include "Traverse.h"
#include "zeexygen/Manager.h"
#include "zeekygen/Manager.h"
ID::ID(const char* arg_name, IDScope arg_scope, bool arg_is_export)
{
@ -632,7 +632,7 @@ void ID::DescribeReSTShort(ODesc* d) const
if ( is_type )
d->Add(type_name(t));
else
d->Add(zeexygen_mgr->GetEnumTypeName(Name()).c_str());
d->Add(zeekygen_mgr->GetEnumTypeName(Name()).c_str());
break;
default: