Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 07:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change merge_types() to take IntrusivePtrs

Browse source
This commit is contained in:
Jon Siwek 2020-05-21 19:57:07 -07:00
parent 4b17929b6b
commit 2c4cc95e7c
2 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Type.h
View file

@ -832,7 +832,8 @@ extern TypeTag max_type(TypeTag t1, TypeTag t2);
// Given two types, returns the "merge", in which promotable types
// are promoted to the maximum of the two. Returns nil (and generates
// an error message) if the types are incompatible.
IntrusivePtr<BroType> merge_types(const BroType* t1, const BroType* t2);
IntrusivePtr<BroType> merge_types(const IntrusivePtr<BroType>& t1,
const IntrusivePtr<BroType>& t2);
// Given a list of expressions, returns a (ref'd) type reflecting
// a merged type consistent across all of them, or nil if this