From c57201be6d84bd3917f403ef27dff3d1716bcd90 Mon Sep 17 00:00:00 2001 From: richterm Date: Thu, 14 May 2009 11:09:15 +0000 Subject: [PATCH] avoid warning for the default HLT simulation - changed default output data type of BlockFilter component from 'Void' to 'Any' - bugfix in AliHLTComponent: handle component output type kAliHLTAnyDataType correctly --- HLT/BASE/AliHLTComponent.cxx | 2 +- HLT/BASE/util/AliHLTBlockFilterComponent.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HLT/BASE/AliHLTComponent.cxx b/HLT/BASE/AliHLTComponent.cxx index b7b8d4f85b6..f5b2902e0c3 100644 --- a/HLT/BASE/AliHLTComponent.cxx +++ b/HLT/BASE/AliHLTComponent.cxx @@ -588,7 +588,7 @@ int AliHLTComponent::FindMatchingDataTypes(AliHLTComponent* pConsumer, AliHLTCom AliHLTComponentDataTypeList itypes; AliHLTComponentDataTypeList otypes; otypes.push_back(GetOutputDataType()); - if (otypes[0]==kAliHLTMultipleDataType) { + if (MatchExactly(otypes[0],kAliHLTMultipleDataType)) { otypes.clear(); int count=0; if ((count=GetOutputDataTypes(otypes))>0) { diff --git a/HLT/BASE/util/AliHLTBlockFilterComponent.cxx b/HLT/BASE/util/AliHLTBlockFilterComponent.cxx index 2a9ea708c7b..f38102b9f7b 100644 --- a/HLT/BASE/util/AliHLTBlockFilterComponent.cxx +++ b/HLT/BASE/util/AliHLTBlockFilterComponent.cxx @@ -56,7 +56,7 @@ AliHLTComponentDataType AliHLTBlockFilterComponent::GetOutputDataType() { // see header file for class documentation if (fFilterRules.size()==1) return fFilterRules[0].fDataType; - if (fFilterRules.size()==0) return kAliHLTVoidDataType; + if (fFilterRules.size()==0) return kAliHLTAnyDataType; return kAliHLTMultipleDataType; } -- 2.43.0