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

Brokerstore<->Tables: attribute conflicts

Browse source 
Makes some attributes conflict with each other. This also needed the
test to change.

The test is a bit flaky - but I can, for the heck of it, not figure out
why. I am punting that for the future after spending a few hours on it.
This commit is contained in:
Johanna Amann 2020-06-25 19:28:35 -07:00
parent 09119ae69d
commit b027b69f5d
4 changed files with 74 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Val.h
View file

@ -1070,8 +1070,8 @@ protected:
// Enum for the different kinds of changes an &on_change handler can see
enum OnChangeType { ELEMENT_NEW, ELEMENT_CHANGED, ELEMENT_REMOVED, ELEMENT_EXPIRED };
// Calls &change_func. Does not take ownership of values. (Refs if needed).
void CallChangeFunc(const Val* index, const IntrusivePtr<Val>& old_value,
// Calls &change_func.
void CallChangeFunc(const IntrusivePtr<Val>& index, const IntrusivePtr<Val>& old_value,
OnChangeType tpe);
// Sends data on to backing Broker Store