From 6d69dda8f061a82063ae7ef4ddba940d75f7b0d8 Mon Sep 17 00:00:00 2001
From: Danilo Piparo <danilo.piparo@cern.ch>
Date: Tue, 7 May 2019 11:11:08 +0200
Subject: [PATCH] [DictGen] Put DictSelectionReader into the ROOT::Internal
namespace
---
core/dictgen/res/DictSelectionReader.h | 8 ++++++--
core/dictgen/src/DictSelectionReader.cxx | 6 ++++++
core/dictgen/src/rootcling_impl.cxx | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/core/dictgen/res/DictSelectionReader.h b/core/dictgen/res/DictSelectionReader.h
index 8dda49afa92..52921d62373 100644
--- a/core/dictgen/res/DictSelectionReader.h
+++ b/core/dictgen/res/DictSelectionReader.h
@@ -234,8 +234,10 @@ ROOT::Selection::NS::C.
* [...]
*
**/
-class DictSelectionReader
- : public clang::RecursiveASTVisitor<DictSelectionReader> {
+namespace ROOT {
+namespace Internal {
+
+class DictSelectionReader : public clang::RecursiveASTVisitor<DictSelectionReader> {
public:
/// Take the selection rules as input (for consistency w/ other selector
/// interfaces)
@@ -302,5 +304,7 @@ private:
bool fIsFirstPass; ///< Keep trance of the number of passes through the AST
ROOT::TMetaUtils::TNormalizedCtxt &fNormCtxt; /// < The reference to the normalized context
};
+}
+}
#endif
diff --git a/core/dictgen/src/DictSelectionReader.cxx b/core/dictgen/src/DictSelectionReader.cxx
index dba6283309a..38dd4c8b4c6 100644
--- a/core/dictgen/src/DictSelectionReader.cxx
+++ b/core/dictgen/src/DictSelectionReader.cxx
@@ -14,6 +14,9 @@
#include <iostream>
#include <sstream>
+namespace ROOT {
+namespace Internal {
+
////////////////////////////////////////////////////////////////////////////////
DictSelectionReader::DictSelectionReader(cling::Interpreter &interp, SelectionRules &selectionRules,
@@ -412,3 +415,6 @@ inline void DictSelectionReader::GetPointeeType(std::string &typeName)
typeName = typeName.substr(0, typeName.size() - 1);
}
}
+
+}
+}
diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
index c90975e043f..4a6271c5193 100644
--- a/core/dictgen/src/rootcling_impl.cxx
+++ b/core/dictgen/src/rootcling_impl.cxx
@@ -4610,7 +4610,7 @@ int RootClingMain(int argc,
// Select using DictSelection
const unsigned int selRulesInitialSize = selectionRules.Size();
if (dictSelection && !onepcm)
- DictSelectionReader dictSelReader(interp, selectionRules, CI->getASTContext(), normCtxt);
+ ROOT::Internal::DictSelectionReader dictSelReader(interp, selectionRules, CI->getASTContext(), normCtxt);
bool dictSelRulesPresent = selectionRules.Size() > selRulesInitialSize;
--
GitLab