Skip to content

Commit 94fb155

Browse files
committed
[df] Fix patch compilation
1 parent d352822 commit 94fb155

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

tree/dataframe/inc/ROOT/RDF/InterfaceUtils.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ void JitDefineHelper(F &&f, const ColumnNames_t &cols, std::string_view name, RL
558558
using ColTypes_t = typename TTraits::CallableTraits<Callable_t>::arg_types;
559559

560560
auto ds = lm->GetDataSource();
561-
if (ds != nullptr && colsPtr)
561+
if (ds != nullptr)
562562
AddDSColumns(cols, *lm, *ds, ColTypes_t(), *colRegister);
563563

564564
// will never actually be used (trumped by jittedDefine->GetTypeName()), but we set it to something meaningful

tree/dataframe/inc/ROOT/RDF/RInterfaceBase.hxx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,8 @@ protected:
205205
auto jittedActionOnHeap = RDFInternal::MakeWeakOnHeap(jittedAction);
206206

207207
auto definesCopy = new RDFInternal::RColumnRegister(fColRegister); // deleted in jitted call
208-
auto funcBody = RDFInternal::JitBuildAction(validColumnNames, upcastNodeOnHeap, typeid(HelperArgType),
209-
typeid(ActionTag), helperArgOnHeap, nullptr, nSlots, fColRegister,
210-
GetDataSource(), jittedActionOnHeap, vector2RVec);
208+
auto funcBody = RDFInternal::JitBuildAction(validColumnNames, typeid(HelperArgType), typeid(ActionTag), nullptr,
209+
nSlots, fColRegister, GetDataSource(), vector2RVec);
211210
fLoopManager->RegisterJitHelperCall(funcBody, upcastNodeOnHeap, definesCopy, validColumnNames, jittedActionOnHeap,
212211
helperArgOnHeap);
213212
return MakeResultPtr(r, *fLoopManager, std::move(jittedAction));

tree/dataframe/src/RLoopManager.cxx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,6 @@ std::string &GetCodeToJit()
9090
static std::string code;
9191
return code;
9292
}
93-
std::string &GetCodeToDeclare()
94-
{
95-
static std::string code;
96-
return code;
97-
}
9893

9994
std::string &GetCodeToDeclare()
10095
{

0 commit comments

Comments
 (0)