Skip to content

Commit 6f9387c

Browse files
kevinbackhouseneheb
authored andcommitted
Add [[nodiscard]] and suppress warnings in unit test file
1 parent b830908 commit 6f9387c

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

include/exiv2/slice.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ struct Slice : public Internal::MutableSliceBase<Internal::ContainerStorage, con
433433
* Constructs a new constant subSlice. Behaves otherwise exactly like
434434
* the non-const version.
435435
*/
436-
Slice<const container> subSlice(size_t begin, size_t end) const {
436+
[[nodiscard]] Slice<const container> subSlice(size_t begin, size_t end) const {
437437
return this->to_const_base().template subSlice<Slice<const container>>(begin, end);
438438
}
439439
};
@@ -453,7 +453,7 @@ struct Slice<const container> : public Internal::ConstSliceBase<Internal::Contai
453453
using value_type = typename std::remove_cv<typename container::value_type>::type;
454454
#endif
455455

456-
Slice subSlice(size_t begin, size_t end) const {
456+
[[nodiscard]] Slice subSlice(size_t begin, size_t end) const {
457457
return Internal::ConstSliceBase<Internal::ContainerStorage,
458458
const container>::template subSlice<Slice<const container>>(begin, end);
459459
}
@@ -486,7 +486,7 @@ struct Slice<const T*> : public Internal::ConstSliceBase<Internal::PtrSliceStora
486486
// TODO: use using in C++11
487487
}
488488

489-
Slice<const T*> subSlice(size_t begin, size_t end) const {
489+
[[nodiscard]] Slice<const T*> subSlice(size_t begin, size_t end) const {
490490
return Internal::ConstSliceBase<Internal::PtrSliceStorage, const T*>::template subSlice<Slice<const T*>>(begin,
491491
end);
492492
}
@@ -501,7 +501,7 @@ struct Slice<T*> : public Internal::MutableSliceBase<Internal::PtrSliceStorage,
501501
// TODO: use using in C++11
502502
}
503503

504-
Slice<T*> subSlice(size_t begin, size_t end) {
504+
[[nodiscard]] Slice<T*> subSlice(size_t begin, size_t end) {
505505
return Internal::MutableSliceBase<Internal::PtrSliceStorage, T*>::template subSlice<Slice<T*>>(begin, end);
506506
}
507507

unitTests/test_slice.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ TYPED_TEST_P(slice, subSliceSuccessfulConstruction) {
102102
// | | middle
103103
auto center_vals = this->getTestSlice(3, 7);
104104
ASSERT_EQ(center_vals.size(), static_cast<size_t>(4));
105-
ASSERT_NO_THROW(center_vals.subSlice(1, 3));
105+
ASSERT_NO_THROW(static_cast<void>(center_vals.subSlice(1, 3)));
106106

107-
ASSERT_NO_THROW(center_vals.subSlice(1, center_vals.size()));
107+
ASSERT_NO_THROW(static_cast<void>(center_vals.subSlice(1, center_vals.size())));
108108
}
109109

110110
TYPED_TEST_P(slice, subSliceFunctions) {
@@ -119,17 +119,17 @@ TYPED_TEST_P(slice, subSliceFailedConstruction) {
119119
// | | middle
120120
auto middle = this->getTestSlice(4, 6);
121121

122-
ASSERT_THROW(middle.subSlice(1, 5), std::out_of_range);
123-
ASSERT_THROW(middle.subSlice(2, 1), std::out_of_range);
124-
ASSERT_THROW(middle.subSlice(2, 2), std::out_of_range);
122+
ASSERT_THROW(static_cast<void>(middle.subSlice(1, 5)), std::out_of_range);
123+
ASSERT_THROW(static_cast<void>(middle.subSlice(2, 1)), std::out_of_range);
124+
ASSERT_THROW(static_cast<void>(middle.subSlice(2, 2)), std::out_of_range);
125125
}
126126

127127
/*! try to cause integer overflows in a sub-optimal implementation */
128128
TYPED_TEST_P(slice, subSliceConstructionOverflowResistance) {
129129
auto center_vals = this->getTestSlice(3, 7);
130130

131-
ASSERT_THROW(center_vals.subSlice(std::numeric_limits<size_t>::max() - 2, 3), std::out_of_range);
132-
ASSERT_THROW(center_vals.subSlice(2, std::numeric_limits<size_t>::max() - 1), std::out_of_range);
131+
ASSERT_THROW(static_cast<void>(center_vals.subSlice(std::numeric_limits<size_t>::max() - 2, 3)), std::out_of_range);
132+
ASSERT_THROW(static_cast<void>(center_vals.subSlice(2, std::numeric_limits<size_t>::max() - 1)), std::out_of_range);
133133
}
134134

135135
/*!

0 commit comments

Comments
 (0)