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

This commit is contained in:
Bernhard Amann 2011-12-03 20:15:05 -08:00
commit 949ec6897a
40 changed files with 448 additions and 240 deletions

View file

@ -159,7 +159,7 @@ bool LogVal::IsCompatibleType(BroType* t, bool atomic_only)
if ( atomic_only )
return false;
return IsCompatibleType(t->AsVectorType()->YieldType());
return IsCompatibleType(t->AsVectorType()->YieldType(), true);
}
default: