diff --git a/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx b/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx index cc3218a556590..a3c19502cb3a0 100644 --- a/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx +++ b/tree/ntuple/v7/inc/ROOT/RField/RFieldRecord.hxx @@ -128,10 +128,9 @@ class RField> final : public RPairField { using ContainerT = typename std::pair; private: - template static std::array, 2> BuildItemFields() { - return {std::make_unique>("_0"), std::make_unique>("_1")}; + return {std::make_unique>("_0"), std::make_unique>("_1")}; } static std::array BuildItemOffsets() @@ -144,7 +143,7 @@ private: public: static std::string TypeName() { return "std::pair<" + RField::TypeName() + "," + RField::TypeName() + ">"; } - explicit RField(std::string_view name) : RPairField(name, BuildItemFields(), BuildItemOffsets()) + explicit RField(std::string_view name) : RPairField(name, BuildItemFields(), BuildItemOffsets()) { fMaxAlignment = std::max(alignof(T1), alignof(T2)); fSize = sizeof(ContainerT); @@ -195,11 +194,10 @@ private: if constexpr (sizeof...(TailTs) > 0) _BuildItemFields(itemFields, index + 1); } - template static std::vector> BuildItemFields() { std::vector> result; - _BuildItemFields(result); + _BuildItemFields(result); return result; } @@ -212,18 +210,16 @@ private: if constexpr (sizeof...(TailTs) > 0) _BuildItemOffsets(offsets, tuple); } - template static std::vector BuildItemOffsets() { std::vector result; - _BuildItemOffsets<0, Ts...>(result, ContainerT()); + _BuildItemOffsets<0, ItemTs...>(result, ContainerT()); return result; } public: static std::string TypeName() { return "std::tuple<" + BuildItemTypes() + ">"; } - explicit RField(std::string_view name) - : RTupleField(name, BuildItemFields(), BuildItemOffsets()) + explicit RField(std::string_view name) : RTupleField(name, BuildItemFields(), BuildItemOffsets()) { fMaxAlignment = std::max({alignof(ItemTs)...}); fSize = sizeof(ContainerT);