Changes for Root6 (Mikolaj)

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTCTPData.cxx

diff --git a/HLT/BASE/AliHLTCTPData.cxx b/HLT/BASE/AliHLTCTPData.cxx
index bae38fdd26e6bb8a8ed30997bc2dd07d7245b4db..6f61f7df5b3362884102e0f55c4cca33069900db 100644 (file)
--- a/HLT/BASE/AliHLTCTPData.cxx
+++ b/HLT/BASE/AliHLTCTPData.cxx
@@ -30,6 +30,7 @@
 #include "AliHLTCDHWrapper.h"
 #include <limits>
 #include <sstream>
+#include <RVersion.h>
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTCTPData)
@@ -299,7 +300,11 @@ bool AliHLTCTPData::EvaluateCTPTriggerClass(const char* expression, AliHLTTrigge
   }
 
   TFormula form("trigger expression", condition);
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,99,0)
+  if (form.IsValid()!=0) {
+#else
   if (form.Compile()!=0) {
+#endif
     HLTError("invalid expression %s", expression);
     return false;
   }