Skip to content

[6.40] [ntuple] fix type check in REntry::BindRawPtr() #22864

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
dpiparo merged 1 commit into from
Jul 22, 2026
+7 −1
Merged

[6.40] [ntuple] fix type check in REntry::BindRawPtr() #22864

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion tree/ntuple/inc/ROOT/REntry.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public:
template <typename T>
void BindRawPtr(std::string_view fieldName, T *rawPtr)
{
BindRawPtr<void>(GetToken(fieldName), rawPtr);
BindRawPtr<T>(GetToken(fieldName), rawPtr);
}

/// Get the (typed) pointer to the value for the field referenced by `token`.
Expand Down
6 changes: 6 additions & 0 deletions tree/ntuple/test/ntuple_basics.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,12 @@ TEST(REntry, Basics)
EXPECT_EQ("float", e->GetTypeName("pt"));
EXPECT_EQ("float", e->GetTypeName(model->GetToken("pt")));

float rawPt;
double wrongType;
e->BindRawPtr("pt", &rawPt);
EXPECT_EQ(&rawPt, e->GetPtr<float>("pt").get());
EXPECT_THROW(e->BindRawPtr("pt", &wrongType), ROOT::RException);

auto ptrPt = std::make_shared<float>();
e->BindValue("pt", ptrPt);
EXPECT_EQ(ptrPt.get(), e->GetPtr<float>("pt").get());
Expand Down
Loading