Changeset 0852ba95 in git for classes

Timestamp:

Feb 16, 2021, 4:33:20 PM (4 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

master

Children:

726e804

Parents:

2671df6 (diff), 7967061 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

• classes/DelphesTF2.cc (modified) (1 diff)

classes/DelphesTF2.cc

@@ -32 +32 @@
 {
 
-#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0)
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 23, 0)
+  fFormula = std::unique_ptr<TFormula>(new TFormula());
+#elif ROOT_VERSION_CODE >= ROOT_VERSION(6, 3, 0)
   fFormula = new TFormula();
 #endif