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

Merge remote-tracking branch 'origin/topic/bernhard/ticket-1163'

Browse source 
* origin/topic/bernhard/ticket-1163:
  Change #types description of sets to set

BIT-1163 #merged
This commit is contained in:
Robin Sommer 2014-04-01 16:50:01 -07:00
commit 2d170edb1e
68 changed files with 221 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/threading/SerialTypes.cc
View file

@ -66,7 +66,14 @@ bool Field::Write(SerializationFormat* fmt) const
string Field::TypeName() const
{
string n = type_name(type);
string n;
// We do not support tables, if the internal Bro type is table it
// always is a set.
if ( type == TYPE_TABLE )
n = "set";
else
n = type_name(type);
if ( (type == TYPE_TABLE) || (type == TYPE_VECTOR) )
{