Skip to content

Commit 2105800

Browse files
committed
[ntuple] mark some move constructors noexcept
1 parent 1016c52 commit 2105800

7 files changed

Lines changed: 17 additions & 16 deletions

File tree

tree/ntuple/inc/ROOT/RFieldBase.hxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,8 @@ public:
790790
fTypeInfo = nullptr;
791791
return *this;
792792
}
793-
RValue(RValue &&other) : fField(other.fField), fObjPtr(std::move(other.fObjPtr)) {}
794-
RValue &operator=(RValue &&other)
793+
RValue(RValue &&other) noexcept : fField(other.fField), fObjPtr(std::move(other.fObjPtr)) {}
794+
RValue &operator=(RValue &&other) noexcept
795795
{
796796
fField = other.fField;
797797
fObjPtr = other.fObjPtr;
@@ -927,8 +927,8 @@ public:
927927
~RBulkValues();
928928
RBulkValues(const RBulkValues &) = delete;
929929
RBulkValues &operator=(const RBulkValues &) = delete;
930-
RBulkValues(RBulkValues &&other);
931-
RBulkValues &operator=(RBulkValues &&other);
930+
RBulkValues(RBulkValues &&other) noexcept;
931+
RBulkValues &operator=(RBulkValues &&other) noexcept;
932932

933933
// Sets `fValues` and `fSize`/`fCapacity` to the given values. The capacity is specified in number of values.
934934
// Once a buffer is adopted, an attempt to read more values then available throws an exception.

tree/ntuple/inc/ROOT/RNTupleAttrWriting.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ public:
7575
RNTupleAttrPendingRange(const RNTupleAttrPendingRange &) = delete;
7676
RNTupleAttrPendingRange &operator=(const RNTupleAttrPendingRange &) = delete;
7777

78-
RNTupleAttrPendingRange(RNTupleAttrPendingRange &&other) { *this = std::move(other); }
78+
RNTupleAttrPendingRange(RNTupleAttrPendingRange &&other) noexcept { *this = std::move(other); }
7979

8080
// NOTE: explicitly implemented to make sure that 'other' gets invalidated upon move.
81-
RNTupleAttrPendingRange &operator=(RNTupleAttrPendingRange &&other)
81+
RNTupleAttrPendingRange &operator=(RNTupleAttrPendingRange &&other) noexcept
8282
{
8383
if (&other != this) {
8484
std::swap(fStart, other.fStart);

tree/ntuple/inc/ROOT/RNTupleReader.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ public:
173173
public:
174174
~RActiveEntryToken() { Reset(); }
175175
RActiveEntryToken(const RActiveEntryToken &other);
176-
RActiveEntryToken(RActiveEntryToken &&other);
176+
RActiveEntryToken(RActiveEntryToken &&other) noexcept;
177177
RActiveEntryToken &operator=(const RActiveEntryToken &other);
178-
RActiveEntryToken &operator=(RActiveEntryToken &&other);
178+
RActiveEntryToken &operator=(RActiveEntryToken &&other) noexcept;
179179

180180
NTupleSize_t GetEntryNumber() const { return fEntryNumber; }
181181
/// Set or replace the entry number. If the entry number is replaced, the cluster corresponding to the new

tree/ntuple/inc/ROOT/RNTupleView.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,11 +365,11 @@ private:
365365
public:
366366
RNTupleCollectionView(const RNTupleCollectionView &other) = delete;
367367
RNTupleCollectionView &operator=(const RNTupleCollectionView &other) = delete;
368-
RNTupleCollectionView(RNTupleCollectionView &&other)
368+
RNTupleCollectionView(RNTupleCollectionView &&other) noexcept(false)
369369
: fSource(other.fSource), fField(std::move(other.fField)), fValue(fField.CreateValue())
370370
{
371371
}
372-
RNTupleCollectionView &operator=(RNTupleCollectionView &&other)
372+
RNTupleCollectionView &operator=(RNTupleCollectionView &&other) noexcept(false)
373373
{
374374
if (this == &other)
375375
return *this;

tree/ntuple/inc/ROOT/RPageSinkBuf.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class RPageSinkBuf : public RPageSink {
5252
RColumnBuf() = default;
5353
RColumnBuf(const RColumnBuf&) = delete;
5454
RColumnBuf& operator=(const RColumnBuf&) = delete;
55-
RColumnBuf(RColumnBuf&&) = default;
56-
RColumnBuf& operator=(RColumnBuf&&) = default;
55+
RColumnBuf(RColumnBuf &&) noexcept = default;
56+
RColumnBuf &operator=(RColumnBuf &&) noexcept = default;
5757
~RColumnBuf() { DropBufferedPages(); }
5858

5959
/// Returns a reference to the newly buffered page. The reference remains

tree/ntuple/src/RFieldBase.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void ROOT::RFieldBase::RValue::BindRawPtr(void *rawPtr)
129129

130130
//------------------------------------------------------------------------------
131131

132-
ROOT::RFieldBase::RBulkValues::RBulkValues(RBulkValues &&other)
132+
ROOT::RFieldBase::RBulkValues::RBulkValues(RBulkValues &&other) noexcept
133133
: fField(other.fField),
134134
fValueSize(other.fValueSize),
135135
fCapacity(other.fCapacity),
@@ -143,7 +143,7 @@ ROOT::RFieldBase::RBulkValues::RBulkValues(RBulkValues &&other)
143143
std::swap(fMaskAvail, other.fMaskAvail);
144144
}
145145

146-
ROOT::RFieldBase::RBulkValues &ROOT::RFieldBase::RBulkValues::operator=(RBulkValues &&other)
146+
ROOT::RFieldBase::RBulkValues &ROOT::RFieldBase::RBulkValues::operator=(RBulkValues &&other) noexcept
147147
{
148148
std::swap(fField, other.fField);
149149
std::swap(fDeleter, other.fDeleter);

tree/ntuple/src/RNTupleReader.cxx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ ROOT::RNTupleReader::RActiveEntryToken::RActiveEntryToken(const RActiveEntryToke
8484
SetEntryNumber(other.fEntryNumber);
8585
}
8686

87-
ROOT::RNTupleReader::RActiveEntryToken::RActiveEntryToken(RActiveEntryToken &&other)
87+
ROOT::RNTupleReader::RActiveEntryToken::RActiveEntryToken(RActiveEntryToken &&other) noexcept
8888
{
8989
std::swap(fEntryNumber, other.fEntryNumber);
9090
std::swap(fPtrControlBlock, other.fPtrControlBlock);
@@ -105,7 +105,8 @@ ROOT::RNTupleReader::RActiveEntryToken::operator=(const RActiveEntryToken &other
105105
return *this;
106106
}
107107

108-
ROOT::RNTupleReader::RActiveEntryToken &ROOT::RNTupleReader::RActiveEntryToken::operator=(RActiveEntryToken &&other)
108+
ROOT::RNTupleReader::RActiveEntryToken &
109+
ROOT::RNTupleReader::RActiveEntryToken::operator=(RActiveEntryToken &&other) noexcept
109110
{
110111
std::swap(fEntryNumber, other.fEntryNumber);
111112
std::swap(fPtrControlBlock, other.fPtrControlBlock);

0 commit comments

Comments
 (0)