Skip to content

Commit 8136e27

Browse files
committed
[df] clang-format
1 parent a898e7a commit 8136e27

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,10 @@ protected:
204204
fColRegister, proxiedPtr->GetVariations());
205205
auto jittedActionOnHeap = RDFInternal::MakeWeakOnHeap(jittedAction);
206206

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

tree/dataframe/src/RDFInterfaceUtils.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,14 +784,14 @@ BookVariationJit(const std::vector<std::string> &colNames, std::string_view vari
784784
<< "reinterpret_cast<std::weak_ptr<ROOT::Internal::RDF::RJittedVariation>*>(wkJittedVariation),"
785785
<< "colRegister, prevNodeOnHeap);\n"
786786
<< "delete variedColNames;\n}\n";
787-
lm.RegisterJitHelperCall(varyInvocation.str(), upcastNodeOnHeap, colRegisterCopy, parsedExpr.fUsedCols, MakeWeakOnHeap(jittedVariation), variedColsOnHeap);
787+
lm.RegisterJitHelperCall(varyInvocation.str(), upcastNodeOnHeap, colRegisterCopy, parsedExpr.fUsedCols,
788+
MakeWeakOnHeap(jittedVariation), variedColsOnHeap);
788789
return jittedVariation;
789790
}
790791

791792
// Jit and call something equivalent to "this->BuildAndBook<ColTypes...>(params...)"
792793
// (see comments in the body for actual jitted code)
793-
std::string JitBuildAction(const ColumnNames_t &cols,
794-
const std::type_info &helperArgType, const std::type_info &at,
794+
std::string JitBuildAction(const ColumnNames_t &cols, const std::type_info &helperArgType, const std::type_info &at,
795795
TTree *tree, const unsigned int nSlots, const RColumnRegister &colRegister, RDataSource *ds,
796796
const bool vector2RVec)
797797
{

tree/dataframe/src/RLoopManager.cxx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -812,14 +812,14 @@ void RLoopManager::Jit()
812812
auto &nameMap = GetJitHelperNameMap();
813813
auto clinfo = gInterpreter->ClassInfo_Factory("R_rdf");
814814
assert(gInterpreter->ClassInfo_IsValid(clinfo));
815-
for (auto & codeAndName : nameMap) {
816-
JitHelperFunc * & addr = funcMap[codeAndName.second];
815+
for (auto &codeAndName : nameMap) {
816+
JitHelperFunc *&addr = funcMap[codeAndName.second];
817817
if (!addr) {
818818
// fast fetch of the address via gInterpreter
819819
// (faster than gInterpreter->Evaluate(function name, ret), ret->GetAsPointer())
820820
auto declid = gInterpreter->GetFunction(clinfo, codeAndName.second.c_str());
821821
assert(declid);
822-
auto minfo = gInterpreter->MethodInfo_Factory(declid);
822+
auto minfo = gInterpreter->MethodInfo_Factory(declid);
823823
assert(gInterpreter->MethodInfo_IsValid(minfo));
824824
auto mname = gInterpreter->MethodInfo_GetMangledName(minfo);
825825
addr = reinterpret_cast<JitHelperFunc *>(gInterpreter->FindSym(mname));

0 commit comments

Comments
 (0)