Skip to content

[ntuple] Use dynamic platform-dependent width rather than hard-coded width of long #19429

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 2 commits into from
Jul 24, 2025
Merged

[ntuple] Use dynamic platform-dependent width rather than hard-coded width of long #19429

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25bb951
[ntuple] Use dynamic platform-dependent width rather than hard-coded …
ferdymercury Jul 22, 2025
d6a99b5
[ntuple] delegate the mapping of ROOT core types onto RField
ferdymercury Jul 23, 2025
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
46 changes: 23 additions & 23 deletions tree/ntuple/src/RFieldMeta.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,16 +526,16 @@ ROOT::REnumField::REnumField(std::string_view fieldName, TEnum *enump)
}

switch (enump->GetUnderlyingType()) {
case kChar_t: Attach(std::make_unique<RField<int8_t>>("_0")); break;
case kUChar_t: Attach(std::make_unique<RField<uint8_t>>("_0")); break;
case kShort_t: Attach(std::make_unique<RField<int16_t>>("_0")); break;
case kUShort_t: Attach(std::make_unique<RField<uint16_t>>("_0")); break;
case kInt_t: Attach(std::make_unique<RField<int32_t>>("_0")); break;
case kUInt_t: Attach(std::make_unique<RField<uint32_t>>("_0")); break;
case kLong_t:
case kLong64_t: Attach(std::make_unique<RField<int64_t>>("_0")); break;
case kULong_t:
case kULong64_t: Attach(std::make_unique<RField<uint64_t>>("_0")); break;
case kChar_t: Attach(std::make_unique<RField<Char_t>>("_0")); break;
case kUChar_t: Attach(std::make_unique<RField<UChar_t>>("_0")); break;
case kShort_t: Attach(std::make_unique<RField<Short_t>>("_0")); break;
case kUShort_t: Attach(std::make_unique<RField<UShort_t>>("_0")); break;
case kInt_t: Attach(std::make_unique<RField<Int_t>>("_0")); break;
case kUInt_t: Attach(std::make_unique<RField<UInt_t>>("_0")); break;
case kLong_t: Attach(std::make_unique<RField<Long_t>>("_0")); break;
case kLong64_t: Attach(std::make_unique<RField<Long64_t>>("_0")); break;
case kULong_t: Attach(std::make_unique<RField<ULong_t>>("_0")); break;
case kULong64_t: Attach(std::make_unique<RField<ULong64_t>>("_0")); break;
default: throw RException(R__FAIL("Unsupported underlying integral type for enum type " + GetTypeName()));
}

Expand Down Expand Up @@ -665,19 +665,19 @@ ROOT::RProxiedCollectionField::RProxiedCollectionField(std::string_view fieldNam
itemField = RFieldBase::Create("_0", valueClass->GetName()).Unwrap();
} else {
switch (fProxy->GetType()) {
case EDataType::kChar_t: itemField = std::make_unique<RField<char>>("_0"); break;
case EDataType::kUChar_t: itemField = std::make_unique<RField<std::uint8_t>>("_0"); break;
case EDataType::kShort_t: itemField = std::make_unique<RField<std::int16_t>>("_0"); break;
case EDataType::kUShort_t: itemField = std::make_unique<RField<std::uint16_t>>("_0"); break;
case EDataType::kInt_t: itemField = std::make_unique<RField<std::int32_t>>("_0"); break;
case EDataType::kUInt_t: itemField = std::make_unique<RField<std::uint32_t>>("_0"); break;
case EDataType::kLong_t:
case EDataType::kLong64_t: itemField = std::make_unique<RField<std::int64_t>>("_0"); break;
case EDataType::kULong_t:
case EDataType::kULong64_t: itemField = std::make_unique<RField<std::uint64_t>>("_0"); break;
case EDataType::kFloat_t: itemField = std::make_unique<RField<float>>("_0"); break;
case EDataType::kDouble_t: itemField = std::make_unique<RField<double>>("_0"); break;
case EDataType::kBool_t: itemField = std::make_unique<RField<bool>>("_0"); break;
case EDataType::kChar_t: itemField = std::make_unique<RField<Char_t>>("_0"); break;
case EDataType::kUChar_t: itemField = std::make_unique<RField<UChar_t>>("_0"); break;
case EDataType::kShort_t: itemField = std::make_unique<RField<Short_t>>("_0"); break;
case EDataType::kUShort_t: itemField = std::make_unique<RField<UShort_t>>("_0"); break;
case EDataType::kInt_t: itemField = std::make_unique<RField<Int_t>>("_0"); break;
case EDataType::kUInt_t: itemField = std::make_unique<RField<UInt_t>>("_0"); break;
case EDataType::kLong_t: itemField = std::make_unique<RField<Long_t>>("_0"); break;
case EDataType::kLong64_t: itemField = std::make_unique<RField<Long64_t>>("_0"); break;
case EDataType::kULong_t: itemField = std::make_unique<RField<ULong_t>>("_0"); break;
case EDataType::kULong64_t: itemField = std::make_unique<RField<ULong64_t>>("_0"); break;
case EDataType::kFloat_t: itemField = std::make_unique<RField<Float_t>>("_0"); break;
case EDataType::kDouble_t: itemField = std::make_unique<RField<Double_t>>("_0"); break;
case EDataType::kBool_t: itemField = std::make_unique<RField<Bool_t>>("_0"); break;
default: throw RException(R__FAIL("unsupported value type"));
}
}
Expand Down
Loading