[ntuple] fix RNTupleMerger using old API

silverweed · silverweed · commit 81000c498fbe · 2024-07-10T09:40:30.000Z
diff --git a/tree/ntuple/v7/src/RNTupleMerger.cxx b/tree/ntuple/v7/src/RNTupleMerger.cxx
@@ -246,7 +246,7 @@ void ROOT::Experimental::Internal::RNTupleMerger::Merge(std::span<RPageSource *>
             }
 
             const auto &columnDesc = descriptor->GetColumnDescriptor(columnId);
-            const auto colElement = RColumnElementBase::Generate(columnDesc.GetModel().GetType());
+            const auto colElement = RColumnElementBase::Generate(columnDesc.GetType());
 
             // Now get the pages for this column in this cluster
             const auto &pages = clusterDesc.GetPageRange(columnId);

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void ROOT::Experimental::Internal::RNTupleMerger::Merge(std::span<RPageSource *>`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`const auto &columnDesc = descriptor->GetColumnDescriptor(columnId);`
`249`		`- const auto colElement = RColumnElementBase::Generate(columnDesc.GetModel().GetType());`
	`249`	`+ const auto colElement = RColumnElementBase::Generate(columnDesc.GetType());`
`250`	`250`
`251`	`251`	`// Now get the pages for this column in this cluster`
`252`	`252`	`const auto &pages = clusterDesc.GetPageRange(columnId);`