Skip to content

[DF] More working around cling+shared_ptr issues #5554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eguiraud merged 1 commit into from
May 6, 2020
Merged

[DF] More working around cling+shared_ptr issues #5554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions tree/dataframe/inc/ROOT/RDF/RInterface.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,23 +2226,24 @@ private:
using NewColEntry_t =
RDFDetail::RCustomColumn<decltype(entryColGen), RDFDetail::CustomColExtraArgs::SlotAndEntry>;

auto entryColumn =
std::make_shared<NewColEntry_t>(fLoopManager, entryColName, entryColType, std::move(entryColGen),
ColumnNames_t{}, fLoopManager->GetNSlots(), newCols);
std::shared_ptr<RDFDetail::RCustomColumnBase> entryColumn{
new NewColEntry_t(fLoopManager, entryColName, entryColType, std::move(entryColGen), ColumnNames_t{},
fLoopManager->GetNSlots(), newCols)};
newCols.AddName(entryColName);
newCols.AddColumn(entryColumn, entryColName);
newCols.AddColumn(std::move(entryColumn), entryColName);

// Slot number column
const std::string slotColName = "rdfslot_";
const std::string slotColType = "unsigned int";
auto slotColGen = [](unsigned int slot) { return slot; };
using NewColSlot_t = RDFDetail::RCustomColumn<decltype(slotColGen), RDFDetail::CustomColExtraArgs::Slot>;

auto slotColumn = std::make_shared<NewColSlot_t>(fLoopManager, slotColName, slotColType, std::move(slotColGen),
ColumnNames_t{}, fLoopManager->GetNSlots(), newCols);
std::shared_ptr<RDFDetail::RCustomColumnBase> slotColumn{new NewColSlot_t(fLoopManager, slotColName, slotColType,
std::move(slotColGen), ColumnNames_t{},
fLoopManager->GetNSlots(), newCols)};

newCols.AddName(slotColName);
newCols.AddColumn(slotColumn, slotColName);
newCols.AddColumn(std::move(slotColumn), slotColName);

fCustomColumns = std::move(newCols);

Expand Down Expand Up @@ -2355,12 +2356,12 @@ private:

using NewCol_t = RDFDetail::RCustomColumn<F, CustomColumnType>;
RDFInternal::RBookedCustomColumns newCols(newColumns);
auto newColumn = std::make_shared<NewCol_t>(fLoopManager, name, retTypeName, std::forward<F>(expression),
validColumnNames, fLoopManager->GetNSlots(), newCols);

std::shared_ptr<RDFDetail::RCustomColumnBase> newColumn{
new NewCol_t(fLoopManager, name, retTypeName, std::forward<F>(expression), validColumnNames,
fLoopManager->GetNSlots(), newCols)};

newCols.AddName(name);
newCols.AddColumn(newColumn, name);
newCols.AddColumn(std::move(newColumn), name);

RInterface<Proxied> newInterface(fProxiedPtr, *fLoopManager, std::move(newCols), fDataSource);

Expand Down