Move Type types to zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-06-04 10:40:43 -07:00
parent 4a1b39a2be
commit ed13972924
120 changed files with 2094 additions and 1934 deletions

View file

@ -18,11 +18,11 @@ static void topk_element_hash_delete_func(void* val)
delete e;
}
void TopkVal::Typify(IntrusivePtr<BroType> t)
void TopkVal::Typify(IntrusivePtr<zeek::BroType> t)
{
assert(!hash && !type);
type = std::move(t);
auto tl = make_intrusive<TypeList>(type);
auto tl = make_intrusive<zeek::TypeList>(type);
tl->Append(type);
hash = new CompositeHash(std::move(tl));
}
@ -191,7 +191,7 @@ IntrusivePtr<VectorVal> TopkVal::GetTopK(int k) const // returns vector
return nullptr;
}
auto v = make_intrusive<VectorType>(type);
auto v = make_intrusive<zeek::VectorType>(type);
auto t = make_intrusive<VectorVal>(std::move(v));
// this does no estimation if the results is correct!

View file

@ -161,9 +161,9 @@ private:
*
* @param t type that is tracked
*/
void Typify(IntrusivePtr<BroType> t);
void Typify(IntrusivePtr<zeek::BroType> t);
IntrusivePtr<BroType> type;
IntrusivePtr<zeek::BroType> type;
CompositeHash* hash;
std::list<Bucket*> buckets;
PDict<Element>* elementDict;