Merge remote-tracking branch 'origin/master' into topic/bernhard/file-analysis-x509

This commit is contained in:
Bernhard Amann 2014-03-13 00:09:48 -07:00
commit b0c3486fd6
74 changed files with 655 additions and 857 deletions

View file

@ -585,7 +585,7 @@ class VectorType : public BroType {
public:
VectorType(BroType* t);
virtual ~VectorType();
BroType* YieldType() { return yield_type; }
BroType* YieldType();
int MatchesIndex(ListExpr*& index) const;