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

Cleanups related to PDict -> std::map replacements

Browse source
This commit is contained in:
Jon Siwek 2019-08-13 19:54:42 -07:00
parent e6558d1f19
commit 87f85ecca1
18 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Type.cc
View file

@ -1799,7 +1799,7 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
// Doing a lookup here as a roundabout way of ref-ing t1, without
// changing the function params which has t1 as const and also
// (potentially) avoiding a pitfall mentioned earlier about clones.
auto id = global_scope()->Lookup(t1->GetName().data());
auto id = global_scope()->Lookup(t1->GetName());
if ( id && id->AsType() && id->AsType()->Tag() == TYPE_ENUM )
// It should make most sense to return the real type here rather