Fix missing IntrusivePtr.h include and ambiguous ODesc::Add call

This commit is contained in:
Jon Siwek 2020-03-25 19:37:06 -07:00
parent 54bc3bd5c6
commit 599dda9ae9
4 changed files with 4 additions and 1 deletions

View file

@ -15,6 +15,7 @@
#include "UID.h" #include "UID.h"
#include "WeirdState.h" #include "WeirdState.h"
#include "ZeekArgs.h" #include "ZeekArgs.h"
#include "IntrusivePtr.h"
#include "iosource/Packet.h" #include "iosource/Packet.h"
#include "analyzer/Tag.h" #include "analyzer/Tag.h"

View file

@ -7,6 +7,7 @@
#include "iosource/IOSource.h" #include "iosource/IOSource.h"
#include "Flare.h" #include "Flare.h"
#include "ZeekArgs.h" #include "ZeekArgs.h"
#include "IntrusivePtr.h"
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>

View file

@ -3304,7 +3304,7 @@ void describe_vals(const std::vector<IntrusivePtr<Val>>& vals,
{ {
if ( ! d->IsReadable() ) if ( ! d->IsReadable() )
{ {
d->Add(vals.size()); d->Add(static_cast<uint64_t>(vals.size()));
d->SP(); d->SP();
} }

View file

@ -7,6 +7,7 @@
#include "../Obj.h" #include "../Obj.h"
#include "../EventHandler.h" #include "../EventHandler.h"
#include "../Timer.h" #include "../Timer.h"
#include "../IntrusivePtr.h"
#include <list> #include <list>
#include <vector> #include <vector>