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

Merge remote branch 'origin/topic/robin/optional-fields' into topic/logging-framework

Browse source
This commit is contained in:
Seth Hall 2011-02-06 00:24:11 -05:00
commit 205d84b651
22 changed files with 358 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Type.cc
View file

@ -1432,6 +1432,17 @@ int same_type(const BroType* t1, const BroType* t2, int is_init)
return 0;
}
int same_attrs(const Attributes* a1, const Attributes* a2)
{
if ( ! a1 )
return (a2 != 0);
if ( ! a2 )
return 0;
return (*a1 == *a2);
}
int record_promotion_compatible(const RecordType* /* super_rec */,
const RecordType* /* sub_rec */)
{