Skip to content

[ntuple] Fix [u]int64_t renormalization on Windows #19550

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
merged 1 commit into from
Aug 16, 2025
Merged

[ntuple] Fix [u]int64_t renormalization on Windows #19550

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
8 changes: 8 additions & 0 deletions tree/ntuple/src/RFieldUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,14 @@ void MapIntegerType(std::string &typeName)
typeName = ROOT::RField<long long int>::TypeName();
} else if (typeName == "unsigned long long" || typeName == "unsigned long long int") {
typeName = ROOT::RField<unsigned long long int>::TypeName();
} else {
// The following two types are 64-bit integers on Windows that we can encounter during renormalization of
// demangled std::type_info names.
if (typeName == "__int64") {
typeName = "std::int64_t";
} else if (typeName == "unsigned __int64") {
typeName = "std::uint64_t";
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions tree/ntuple/test/ntuple_type_name.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ TEST(RNTuple, TypeNameNormalizationById)

EXPECT_EQ("std::int32_t", GetRenormalizedTypeName(typeid(signed)));
EXPECT_EQ("std::int32_t", GetRenormalizedTypeName(typeid(std::int32_t)));
EXPECT_EQ("std::int64_t", GetRenormalizedTypeName(typeid(std::int64_t)));
EXPECT_EQ("std::uint64_t", GetRenormalizedTypeName(typeid(std::uint64_t)));
EXPECT_EQ("double", GetRenormalizedTypeName(typeid(Double32_t)));
EXPECT_EQ("float", GetRenormalizedTypeName(typeid(const float)));

Expand Down
Loading