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

removing dead code

Browse source
This commit is contained in:
Julien Sentier 2012-02-23 13:26:48 +01:00 • committed by Robin Sommer
parent 1df650eb0d
commit a3e419fee0
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Type.cc
View file

@ -1858,13 +1858,8 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
if ( t1->IsSet() ) if ( t1->IsSet() )
return new SetType(tl3, 0); return new SetType(tl3, 0);
else if ( tg1 == TYPE_TABLE )
return new TableType(tl3, y3);
else else
{ return new TableType(tl3, y3);
reporter->InternalError("bad tag in merge_types");
return 0;
}
} }
case TYPE_FUNC: case TYPE_FUNC: