@@ -118,16 +118,16 @@ class RNTupleMerger final {
118118 std::unique_ptr<ROOT ::RNTupleModel> fModel ;
119119
120120 [[nodiscard]]
121- ROOT ::RResult<void > MergeCommonColumns ( ROOT ::Internal::RClusterPool &clusterPool,
122- const ROOT ::RClusterDescriptor &clusterDesc,
123- std::span<const RColumnMergeInfo> commonColumns,
124- const ROOT ::Internal::RCluster::ColumnSet_t &commonColumnSet,
125- std:: size_t nCommonColumnsInCluster, RSealedPageMergeData &sealedPageData ,
126- const RNTupleMergeData &mergeData, ROOT ::Internal::RPageAllocator &pageAlloc);
121+ ROOT ::RResult<void >
122+ MergeCommonColumns ( ROOT ::Internal::RClusterPool &clusterPool, const ROOT ::RClusterDescriptor &clusterDesc,
123+ std::span<RColumnMergeInfo> commonColumns,
124+ const ROOT ::Internal::RCluster::ColumnSet_t &commonColumnSet, std:: size_t nCommonColumnsInCluster ,
125+ RSealedPageMergeData &sealedPageData, const RNTupleMergeData &mergeData ,
126+ ROOT ::Internal::RPageAllocator &pageAlloc);
127127
128128 [[nodiscard]]
129129 ROOT ::RResult<void >
130- MergeSourceClusters (ROOT ::Internal::RPageSource &source, std::span<const RColumnMergeInfo> commonColumns,
130+ MergeSourceClusters (ROOT ::Internal::RPageSource &source, std::span<RColumnMergeInfo> commonColumns,
131131 std::span<const RColumnMergeInfo> extraDstColumns, RNTupleMergeData &mergeData);
132132
133133 // / Creates a RNTupleMerger with the given destination.
0 commit comments