From 80de1a16435d4744e91ca21c373dec8afc2cd8f6 Mon Sep 17 00:00:00 2001 From: Enrico Guiraud <enrico.guiraud@cern.ch> Date: Thu, 7 Jun 2018 15:44:09 +0200 Subject: [PATCH] [TREEPROC][NFC] Rename GetTreeName -> FindTreeName --- tree/treeplayer/inc/ROOT/TTreeProcessorMT.hxx | 2 +- tree/treeplayer/src/TTreeProcessorMT.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tree/treeplayer/inc/ROOT/TTreeProcessorMT.hxx b/tree/treeplayer/inc/ROOT/TTreeProcessorMT.hxx index b1744ee1e11..7e31a7ac69a 100644 --- a/tree/treeplayer/inc/ROOT/TTreeProcessorMT.hxx +++ b/tree/treeplayer/inc/ROOT/TTreeProcessorMT.hxx @@ -193,7 +193,7 @@ namespace ROOT { ROOT::TThreadedObject<ROOT::Internal::TTreeView> treeView; ///<! Thread-local TreeViews Internal::FriendInfo GetFriendInfo(TTree &tree); - std::string GetTreeName(); + std::string FindTreeName(); public: TTreeProcessorMT(std::string_view filename, std::string_view treename = ""); diff --git a/tree/treeplayer/src/TTreeProcessorMT.cxx b/tree/treeplayer/src/TTreeProcessorMT.cxx index 07efe42a882..5b241556e63 100644 --- a/tree/treeplayer/src/TTreeProcessorMT.cxx +++ b/tree/treeplayer/src/TTreeProcessorMT.cxx @@ -135,7 +135,7 @@ Internal::FriendInfo TTreeProcessorMT::GetFriendInfo(TTree &tree) //////////////////////////////////////////////////////////////////////////////// /// Retrieve the name of the first TTree in the first input file, else throw. -std::string TTreeProcessorMT::GetTreeName() +std::string TTreeProcessorMT::FindTreeName() { std::string treeName; @@ -165,7 +165,7 @@ std::string TTreeProcessorMT::GetTreeName() /// the implementation will automatically search for a /// tree in the file. TTreeProcessorMT::TTreeProcessorMT(std::string_view filename, std::string_view treename) - : fFileNames({std::string(filename)}), fTreeName(treename.empty() ? GetTreeName() : treename) {} + : fFileNames({std::string(filename)}), fTreeName(treename.empty() ? FindTreeName() : treename) {} std::vector<std::string> CheckAndConvert(const std::vector<std::string_view> & views) { @@ -186,7 +186,7 @@ std::vector<std::string> CheckAndConvert(const std::vector<std::string_view> & v /// the implementation will automatically search for a /// tree in the collection of files. TTreeProcessorMT::TTreeProcessorMT(const std::vector<std::string_view> &filenames, std::string_view treename) - : fFileNames(CheckAndConvert(filenames)), fTreeName(treename.empty() ? GetTreeName() : treename) {} + : fFileNames(CheckAndConvert(filenames)), fTreeName(treename.empty() ? FindTreeName() : treename) {} std::vector<std::string> GetFilesFromTree(TTree &tree) { -- GitLab