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

Allow duplicate attributes in full redefs

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-28 09:55:40 -07:00
parent 9b2f26c0aa
commit 9106f3f722
5 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ID.cc
View file

@ -314,10 +314,10 @@ std::string ID::GetDeprecationWarning() const
return zeek::util::fmt("deprecated (%s): %s", Name(), result.c_str());
}
void ID::AddAttrs(AttributesPtr a)
void ID::AddAttrs(AttributesPtr a, bool is_redef)
{
if ( attrs )
attrs->AddAttrs(a);
attrs->AddAttrs(a, is_redef);
else
attrs = std::move(a);