Merge remote-tracking branch 'origin/master' into topic/bernhard/input

This commit is contained in:
Bernhard Amann 2011-11-16 23:55:02 -08:00
commit 988f859761
78 changed files with 1042 additions and 440 deletions

View file

@ -151,7 +151,7 @@ bool LogVal::IsCompatibleType(BroType* t, bool atomic_only)
if ( ! t->IsSet() )
return false;
return IsCompatibleType(t->AsSetType()->Indices()->PureType());
return IsCompatibleType(t->AsSetType()->Indices()->PureType(), true);
}
case TYPE_VECTOR: