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

Merge branch 'master' into topic/jsiwek/broxygen

Browse source
This commit is contained in:
Jon Siwek 2013-10-03 13:06:23 -05:00
commit 68227f112d
89 changed files with 792 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Type.cc
View file

@ -193,7 +193,8 @@ unsigned int BroType::MemoryAllocation() const
bool BroType::Serialize(SerialInfo* info) const
{
// We always send full types (see below).
SERIALIZE(true);
if ( ! SERIALIZE(true) )
return false;
bool ret = SerialObj::Serialize(info);
return ret;
@ -1467,10 +1468,8 @@ bool EnumType::DoUnserialize(UnserialInfo* info)
}
VectorType::VectorType(BroType* element_type)
: BroType(TYPE_VECTOR)
: BroType(TYPE_VECTOR), yield_type(element_type)
{
if ( element_type )
yield_type = element_type;
}
VectorType::~VectorType()