Changeset 2871513 in git

Timestamp:

Apr 8, 2017, 2:22:49 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b99c90b, eb3be06

Parents:

4b59725 (diff), d97a18b (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:

• external/ExRootAnalysis/ExRootConfReader.cc (modified) (2 diffs)

external/ExRootAnalysis/ExRootConfReader.cc

@@ -12 +12 @@
 #include "tcl/tcl.h"
 
-#include <libgen.h>
+#include "TSystem.h"
 
 #include <iostream>
@@ -57 +57 @@
   }
 
-  if(isTop) fTopDir = dirname(const_cast<char *>(fileName));
+  if(isTop) fTopDir = gSystem->DirName(fileName);
 
   int file_length = inputFileStream.tellg();