Skip to content

Commit 76d97d1

Browse files
committed
[ntuple] Mark classes as final in RNTupleDescriptor.hxx
1 parent 19d14f2 commit 76d97d1

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

tree/ntuple/v7/inc/ROOT/RNTupleDescriptor.hxx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public:
242242
\brief The window of element indexes of a particular column in a particular cluster
243243
*/
244244
// clang-format on
245-
class RColumnRange {
245+
class RColumnRange final {
246246
ROOT::DescriptorId_t fPhysicalColumnId = ROOT::kInvalidDescriptorId;
247247
/// The global index of the first column element in the cluster
248248
ROOT::NTupleSize_t fFirstElementIndex = ROOT::kInvalidNTupleIndex;
@@ -355,7 +355,7 @@ public:
355355
and we don't need to keep it in memory because it can be easily recomputed.
356356
*/
357357
// clang-format on
358-
struct RPageInfoExtended : RPageInfo {
358+
struct RPageInfoExtended final : RPageInfo {
359359
private:
360360
/// Index (in cluster) of the first element in page.
361361
ROOT::NTupleSize_t fFirstElementIndex = 0;
@@ -383,7 +383,7 @@ public:
383383
\brief Records the partition of data into pages for a particular column in a particular cluster
384384
*/
385385
// clang-format on
386-
class RPageRange {
386+
class RPageRange final {
387387
friend class Internal::RClusterDescriptorBuilder;
388388

389389
private:
@@ -471,12 +471,12 @@ public:
471471
std::uint64_t GetNBytesOnStorage() const;
472472
};
473473

474-
class RClusterDescriptor::RColumnRangeIterable {
474+
class RClusterDescriptor::RColumnRangeIterable final {
475475
private:
476476
const RClusterDescriptor &fDesc;
477477

478478
public:
479-
class RIterator {
479+
class RIterator final {
480480
private:
481481
using Iter_t = std::unordered_map<ROOT::DescriptorId_t, RColumnRange>::const_iterator;
482482
/// The wrapped map iterator
@@ -845,15 +845,15 @@ public:
845845
\brief Used to loop over a field's associated columns
846846
*/
847847
// clang-format on
848-
class RNTupleDescriptor::RColumnDescriptorIterable {
848+
class RNTupleDescriptor::RColumnDescriptorIterable final {
849849
private:
850850
/// The associated NTuple for this range.
851851
const RNTupleDescriptor &fNTuple;
852852
/// The descriptor ids of the columns ordered by field, representation, and column index
853853
std::vector<ROOT::DescriptorId_t> fColumns = {};
854854

855855
public:
856-
class RIterator {
856+
class RIterator final {
857857
private:
858858
/// The enclosing range's NTuple.
859859
const RNTupleDescriptor &fNTuple;
@@ -899,7 +899,7 @@ public:
899899
\brief Used to loop over a field's child fields
900900
*/
901901
// clang-format on
902-
class RNTupleDescriptor::RFieldDescriptorIterable {
902+
class RNTupleDescriptor::RFieldDescriptorIterable final {
903903
private:
904904
/// The associated NTuple for this range.
905905
const RNTupleDescriptor &fNTuple;
@@ -908,7 +908,7 @@ private:
908908
std::vector<ROOT::DescriptorId_t> fFieldChildren = {};
909909

910910
public:
911-
class RIterator {
911+
class RIterator final {
912912
private:
913913
/// The enclosing range's NTuple.
914914
const RNTupleDescriptor &fNTuple;
@@ -962,13 +962,13 @@ public:
962962
Enumerate all cluster group IDs from the descriptor. No specific order can be assumed.
963963
*/
964964
// clang-format on
965-
class RNTupleDescriptor::RClusterGroupDescriptorIterable {
965+
class RNTupleDescriptor::RClusterGroupDescriptorIterable final {
966966
private:
967967
/// The associated NTuple for this range.
968968
const RNTupleDescriptor &fNTuple;
969969

970970
public:
971-
class RIterator {
971+
class RIterator final {
972972
private:
973973
/// The enclosing range's NTuple.
974974
const RNTupleDescriptor &fNTuple;
@@ -1014,13 +1014,13 @@ RNTupleDescriptor::FindNextClusterId() and RNTupleDescriptor::FindPrevClusterId(
10141014
clusters by entry number.
10151015
*/
10161016
// clang-format on
1017-
class RNTupleDescriptor::RClusterDescriptorIterable {
1017+
class RNTupleDescriptor::RClusterDescriptorIterable final {
10181018
private:
10191019
/// The associated NTuple for this range.
10201020
const RNTupleDescriptor &fNTuple;
10211021

10221022
public:
1023-
class RIterator {
1023+
class RIterator final {
10241024
private:
10251025
/// The enclosing range's NTuple.
10261026
const RNTupleDescriptor &fNTuple;
@@ -1062,13 +1062,13 @@ public:
10621062
\brief Used to loop over all the extra type info record of an ntuple (in unspecified order)
10631063
*/
10641064
// clang-format on
1065-
class RNTupleDescriptor::RExtraTypeInfoDescriptorIterable {
1065+
class RNTupleDescriptor::RExtraTypeInfoDescriptorIterable final {
10661066
private:
10671067
/// The associated NTuple for this range.
10681068
const RNTupleDescriptor &fNTuple;
10691069

10701070
public:
1071-
class RIterator {
1071+
class RIterator final {
10721072
private:
10731073
/// The enclosing range's NTuple.
10741074
const RNTupleDescriptor &fNTuple;
@@ -1110,7 +1110,7 @@ public:
11101110
\brief Summarizes information about fields and the corresponding columns that were added after the header has been serialized
11111111
*/
11121112
// clang-format on
1113-
class RNTupleDescriptor::RHeaderExtension {
1113+
class RNTupleDescriptor::RHeaderExtension final {
11141114
friend class Internal::RNTupleDescriptorBuilder;
11151115

11161116
private:
@@ -1188,7 +1188,7 @@ Dangling column descriptors can become actual descriptors when added to an
11881188
RNTupleDescriptorBuilder instance and then linked to their fields.
11891189
*/
11901190
// clang-format on
1191-
class RColumnDescriptorBuilder {
1191+
class RColumnDescriptorBuilder final {
11921192
private:
11931193
RColumnDescriptor fColumn = RColumnDescriptor();
11941194

@@ -1274,7 +1274,7 @@ Dangling field descriptors can only become actual descriptors when added to an
12741274
RNTupleDescriptorBuilder instance and then linked to other fields.
12751275
*/
12761276
// clang-format on
1277-
class RFieldDescriptorBuilder {
1277+
class RFieldDescriptorBuilder final {
12781278
private:
12791279
RFieldDescriptor fField = RFieldDescriptor();
12801280

@@ -1369,7 +1369,7 @@ The cluster descriptor builder starts from a summary-only cluster descriptor and
13691369
piecewise addition of page locations.
13701370
*/
13711371
// clang-format on
1372-
class RClusterDescriptorBuilder {
1372+
class RClusterDescriptorBuilder final {
13731373
private:
13741374
RClusterDescriptor fCluster;
13751375

@@ -1427,7 +1427,7 @@ public:
14271427
\brief A helper class for piece-wise construction of an RClusterGroupDescriptor
14281428
*/
14291429
// clang-format on
1430-
class RClusterGroupDescriptorBuilder {
1430+
class RClusterGroupDescriptorBuilder final {
14311431
private:
14321432
RClusterGroupDescriptor fClusterGroup;
14331433

@@ -1482,7 +1482,7 @@ public:
14821482
\brief A helper class for piece-wise construction of an RExtraTypeInfoDescriptor
14831483
*/
14841484
// clang-format on
1485-
class RExtraTypeInfoDescriptorBuilder {
1485+
class RExtraTypeInfoDescriptorBuilder final {
14861486
private:
14871487
RExtraTypeInfoDescriptor fExtraTypeInfo;
14881488

@@ -1522,7 +1522,7 @@ public:
15221522
Used by RPageStorage implementations in order to construct the RNTupleDescriptor from the various header parts.
15231523
*/
15241524
// clang-format on
1525-
class RNTupleDescriptorBuilder {
1525+
class RNTupleDescriptorBuilder final {
15261526
private:
15271527
RNTupleDescriptor fDescriptor;
15281528
RResult<void> EnsureFieldExists(ROOT::DescriptorId_t fieldId) const;

0 commit comments

Comments
 (0)