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

More polishing of some of the branche's changes.

Browse source
This commit is contained in:
Robin Sommer 2014-07-31 15:01:50 -07:00
parent 0ba4b768cd
commit 8031da4ee7
7 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Type.cc
View file

@ -1476,9 +1476,9 @@ void EnumType::CheckAndAddName(const string& module_name, const char* name,
}
else
{
// We allow double-definitions if matching exactly. This is
// so that we can define an enum both in a *.bif and *.bro to
// avoid cyclic dependencies.
// We allow double-definitions if matching exactly. This is so that
// we can define an enum both in a *.bif and *.bro for avoiding
// cyclic dependencies.
if ( id->Name() != make_full_var_name(module_name.c_str(), name)
|| (id->HasVal() && val != id->ID_Val()->AsEnum()) )
{