@@ -411,7 +411,7 @@ ConvertRegexToColumns(const ColumnNames_t &colNames, std::string_view columnName
411411 // we need to use TPRegexp
412412 TPRegexp regexp (theRegex);
413413 for (auto &&colName : colNames) {
414- if ((isEmptyRegex || regexp.MatchB (colName.c_str ())) && !RDFInternal:: IsInternalColumn (colName)) {
414+ if ((isEmptyRegex || regexp.MatchB (colName.c_str ())) && !IsInternalColumn (colName)) {
415415 selectedColumns.emplace_back (colName);
416416 }
417417 }
@@ -584,8 +584,7 @@ std::string PrettyPrintAddr(const void *const addr)
584584void BookFilterJit (const std::shared_ptr<RJittedFilter> &jittedFilter,
585585 std::shared_ptr<RDFDetail::RNodeBase> *prevNodeOnHeap, std::string_view name,
586586 std::string_view expression, const std::map<std::string, std::string> &aliasMap,
587- const ColumnNames_t &branches, const RDFInternal::RBookedDefines &customCols, TTree *tree,
588- RDataSource *ds)
587+ const ColumnNames_t &branches, const RBookedDefines &customCols, TTree *tree, RDataSource *ds)
589588{
590589 const auto &dsColumns = ds ? ds->GetColumnNames () : ColumnNames_t{};
591590
@@ -629,7 +628,7 @@ void BookFilterJit(const std::shared_ptr<RJittedFilter> &jittedFilter,
629628
630629// Jit a Define call
631630std::shared_ptr<RJittedDefine> BookDefineJit (std::string_view name, std::string_view expression, RLoopManager &lm,
632- RDataSource *ds, const RDFInternal:: RBookedDefines &customCols,
631+ RDataSource *ds, const RBookedDefines &customCols,
633632 const ColumnNames_t &branches,
634633 std::shared_ptr<RNodeBase> *upcastNodeOnHeap)
635634{
@@ -644,7 +643,7 @@ std::shared_ptr<RJittedDefine> BookDefineJit(std::string_view name, std::string_
644643 const auto lambdaName = DeclareLambda (parsedExpr.fExpr , parsedExpr.fVarNames , exprVarTypes);
645644 const auto type = RetTypeOfLambda (lambdaName);
646645
647- auto definesCopy = new RDFInternal:: RBookedDefines (customCols);
646+ auto definesCopy = new RBookedDefines (customCols);
648647 auto definesAddr = PrettyPrintAddr (definesCopy);
649648 auto jittedDefine = std::make_shared<RDFDetail::RJittedDefine>(name, type, lm.GetNSlots (), lm.GetDSValuePtrs ());
650649
@@ -676,8 +675,8 @@ std::shared_ptr<RJittedDefine> BookDefineJit(std::string_view name, std::string_
676675// (see comments in the body for actual jitted code)
677676std::string JitBuildAction (const ColumnNames_t &cols, std::shared_ptr<RDFDetail::RNodeBase> *prevNode,
678677 const std::type_info &helperArgType, const std::type_info &at, void *helperArgOnHeap,
679- TTree *tree, const unsigned int nSlots, const RDFInternal:: RBookedDefines &customCols,
680- RDataSource *ds, std::weak_ptr<RJittedAction> *jittedActionOnHeap)
678+ TTree *tree, const unsigned int nSlots, const RBookedDefines &customCols, RDataSource *ds ,
679+ std::weak_ptr<RJittedAction> *jittedActionOnHeap)
681680{
682681 // retrieve type of result of the action as a string
683682 auto helperArgClass = TClass::GetClass (helperArgType);
@@ -696,7 +695,7 @@ std::string JitBuildAction(const ColumnNames_t &cols, std::shared_ptr<RDFDetail:
696695 const std::string actionTypeName = actionTypeClass->GetName ();
697696 const std::string actionTypeNameBase = actionTypeName.substr (actionTypeName.rfind (' :' ) + 1 );
698697
699- auto definesCopy = new RDFInternal:: RBookedDefines (customCols); // deleted in jitted CallBuildAction
698+ auto definesCopy = new RBookedDefines (customCols); // deleted in jitted CallBuildAction
700699 auto definesAddr = PrettyPrintAddr (definesCopy);
701700
702701 // Build a call to CallBuildAction with the appropriate argument. When run through the interpreter, this code will
0 commit comments