Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of github.com:zeek/zeek

Browse source
This commit is contained in:
Johanna Amann 2019-07-22 12:46:04 -07:00
commit ff4845aa80
43 changed files with 275 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Type.cc
View file

@ -226,7 +226,7 @@ void TypeList::Append(BroType* t)
if ( pure_type && ! same_type(t, pure_type) )
reporter->InternalError("pure type-list violation");
types.append(t);
types.push_back(t);
}
void TypeList::AppendEvenIfNotPure(BroType* t)
@ -237,7 +237,7 @@ void TypeList::AppendEvenIfNotPure(BroType* t)
pure_type = 0;
}
types.append(t);
types.push_back(t);
}
void TypeList::Describe(ODesc* d) const
@ -714,7 +714,7 @@ RecordType* RecordType::ShallowClone()
{
auto pass = new type_decl_list();
for ( const auto& type : *types )
pass->append(new TypeDecl(*type));
pass->push_back(new TypeDecl(*type));
return new RecordType(pass);
}
@ -853,7 +853,7 @@ const char* RecordType::AddFields(type_decl_list* others, attr_list* attr)
td->attrs->AddAttr(new Attr(ATTR_LOG));
}
types->append(td);
types->push_back(td);
}
delete others;
@ -1883,7 +1883,7 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
return 0;
}
tdl3->append(new TypeDecl(tdl3_i, copy_string(td1->id)));
tdl3->push_back(new TypeDecl(tdl3_i, copy_string(td1->id)));
}
return new RecordType(tdl3);