Skip to content

Commit 516ab96

Browse files
committed
feature_flag: Call RNTupleDescriptorBuilder::MoveDescriptor
This includes some validity checks that will become (more) important for future ROOT versions.
1 parent fc6e531 commit 516ab96

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

structure/feature_flag/write.C

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ void write(std::string_view filename = "structure.feature_flag.root") {
3030
.FieldId(0)
3131
.MakeDescriptor()
3232
.Unwrap());
33+
auto descriptor = descBuilder.MoveDescriptor();
3334

3435
RNTupleWriteOptions options;
3536
options.SetCompression(0);
@@ -39,16 +40,15 @@ void write(std::string_view filename = "structure.feature_flag.root") {
3940

4041
RNTupleSerializer serializer;
4142

42-
auto ctx = serializer.SerializeHeader(nullptr, descBuilder.GetDescriptor());
43+
auto ctx = serializer.SerializeHeader(nullptr, descriptor);
4344
auto buffer = std::make_unique<unsigned char[]>(ctx.GetHeaderSize());
44-
ctx = serializer.SerializeHeader(buffer.get(), descBuilder.GetDescriptor());
45+
ctx = serializer.SerializeHeader(buffer.get(), descriptor);
4546
writer->WriteNTupleHeader(buffer.get(), ctx.GetHeaderSize(),
4647
ctx.GetHeaderSize());
4748

48-
auto szFooter =
49-
serializer.SerializeFooter(nullptr, descBuilder.GetDescriptor(), ctx);
49+
auto szFooter = serializer.SerializeFooter(nullptr, descriptor, ctx);
5050
buffer = std::make_unique<unsigned char[]>(szFooter);
51-
serializer.SerializeFooter(buffer.get(), descBuilder.GetDescriptor(), ctx);
51+
serializer.SerializeFooter(buffer.get(), descriptor, ctx);
5252
writer->WriteNTupleFooter(buffer.get(), szFooter, szFooter);
5353

5454
writer->Commit();

0 commit comments

Comments
 (0)