Skip to content

Commit b5a7780

Browse files
committed
[ntuple] remove GetCollectionInfo() from collection fields
Several collection fields still had a public GetCollectionInfo() method. It was an oversight not to remove them earlier. These methods are unneeded and potentially dangerous to expose. (cherry picked from commit 47662b4)
1 parent 974e28d commit b5a7780

File tree

3 files changed

+1
-41
lines changed

3 files changed

+1
-41
lines changed

tree/ntuple/inc/ROOT/RField/RFieldProxiedCollection.hxx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,6 @@ public:
180180
size_t GetValueSize() const final { return fProxy->Sizeof(); }
181181
size_t GetAlignment() const final { return alignof(std::max_align_t); }
182182
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
183-
void
184-
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
185-
{
186-
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
187-
}
188-
void
189-
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
190-
{
191-
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
192-
}
193183
};
194184

195185
////////////////////////////////////////////////////////////////////////////////

tree/ntuple/inc/ROOT/RField/RFieldSequenceContainer.hxx

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@ public:
154154
size_t GetValueSize() const final;
155155
size_t GetAlignment() const final;
156156
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
157-
void
158-
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
159-
{
160-
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
161-
}
162-
void
163-
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
164-
{
165-
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
166-
}
167157
};
168158

169159
template <typename ItemT>
@@ -238,16 +228,6 @@ public:
238228
size_t GetValueSize() const final { return sizeof(std::vector<char>); }
239229
size_t GetAlignment() const final { return std::alignment_of<std::vector<char>>(); }
240230
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
241-
void
242-
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
243-
{
244-
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
245-
}
246-
void
247-
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
248-
{
249-
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
250-
}
251231
};
252232

253233
template <typename ItemT>
@@ -296,16 +276,6 @@ public:
296276
size_t GetValueSize() const final { return sizeof(std::vector<bool>); }
297277
size_t GetAlignment() const final { return std::alignment_of<std::vector<bool>>(); }
298278
void AcceptVisitor(ROOT::Detail::RFieldVisitor &visitor) const final;
299-
void
300-
GetCollectionInfo(ROOT::NTupleSize_t globalIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
301-
{
302-
fPrincipalColumn->GetCollectionInfo(globalIndex, collectionStart, size);
303-
}
304-
void
305-
GetCollectionInfo(RNTupleLocalIndex localIndex, RNTupleLocalIndex *collectionStart, ROOT::NTupleSize_t *size) const
306-
{
307-
fPrincipalColumn->GetCollectionInfo(localIndex, collectionStart, size);
308-
}
309279
};
310280

311281
////////////////////////////////////////////////////////////////////////////////

tree/ntuple/src/RFieldSequenceContainer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ std::size_t ROOT::RRVecField::ReadBulkImpl(const RBulkSpec &bulkSpec)
341341
// Get size of the first RVec of the bulk
342342
RNTupleLocalIndex firstItemIndex;
343343
ROOT::NTupleSize_t collectionSize;
344-
this->GetCollectionInfo(bulkSpec.fFirstIndex, &firstItemIndex, &collectionSize);
344+
fPrincipalColumn->GetCollectionInfo(bulkSpec.fFirstIndex, &firstItemIndex, &collectionSize);
345345
*beginPtr = itemValueArray;
346346
*sizePtr = collectionSize;
347347
*capacityPtr = -1;

0 commit comments

Comments
 (0)