Skip to content

Commit 06cf19a

Browse files
committed
remove inline
Signed-off-by: Rosen Penev <[email protected]>
1 parent 4d2d5f3 commit 06cf19a

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

include/exiv2/slice.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Internal {
1717
* knowledge about the stored data.
1818
*/
1919
struct SliceBase {
20-
inline SliceBase(size_t begin, size_t end) : begin_(begin), end_(end) {
20+
SliceBase(size_t begin, size_t end) : begin_(begin), end_(end) {
2121
if (begin >= end) {
2222
throw std::out_of_range("Begin must be smaller than end");
2323
}
@@ -26,7 +26,7 @@ struct SliceBase {
2626
/*!
2727
* Return the number of elements in the slice.
2828
*/
29-
[[nodiscard]] inline size_t size() const noexcept {
29+
[[nodiscard]] size_t size() const noexcept {
3030
// cannot underflow, as we know that begin < end
3131
return end_ - begin_;
3232
}
@@ -38,7 +38,7 @@ struct SliceBase {
3838
* @throw std::out_of_range when `index` will access an element
3939
* outside of the slice
4040
*/
41-
inline void rangeCheck(size_t index) const {
41+
void rangeCheck(size_t index) const {
4242
if (index >= size()) {
4343
throw std::out_of_range("Index outside of the slice");
4444
}
@@ -530,49 +530,49 @@ struct Slice<T*> : public Internal::MutableSliceBase<Internal::PtrSliceStorage,
530530
* parameter deduction.
531531
*/
532532
template <typename T>
533-
inline Slice<T> makeSlice(T& cont, size_t begin, size_t end) {
534-
return Slice<T>(cont, begin, end);
533+
Slice<T> makeSlice(T& cont, size_t begin, size_t end) {
534+
return {cont, begin, end};
535535
}
536536

537537
/*!
538538
* Overload of makeSlice for slices of C-arrays.
539539
*/
540540
template <typename T>
541-
inline Slice<T*> makeSlice(T* ptr, size_t begin, size_t end) {
542-
return Slice<T*>(ptr, begin, end);
541+
Slice<T*> makeSlice(T* ptr, size_t begin, size_t end) {
542+
return {ptr, begin, end};
543543
}
544544

545545
/*!
546546
* @brief Return a new slice spanning the whole container.
547547
*/
548548
template <typename container>
549-
inline Slice<container> makeSlice(container& cont) {
550-
return Slice<container>(cont, 0, cont.size());
549+
Slice<container> makeSlice(container& cont) {
550+
return {cont, 0, cont.size()};
551551
}
552552

553553
/*!
554554
* @brief Return a new slice spanning from begin until the end of the
555555
* container.
556556
*/
557557
template <typename container>
558-
inline Slice<container> makeSliceFrom(container& cont, size_t begin) {
559-
return Slice<container>(cont, begin, cont.size());
558+
Slice<container> makeSliceFrom(container& cont, size_t begin) {
559+
return {cont, begin, cont.size()};
560560
}
561561

562562
/*!
563563
* @brief Return a new slice spanning until `end`.
564564
*/
565565
template <typename container>
566-
inline Slice<container> makeSliceUntil(container& cont, size_t end) {
567-
return Slice<container>(cont, 0, end);
566+
Slice<container> makeSliceUntil(container& cont, size_t end) {
567+
return {cont, 0, end};
568568
}
569569

570570
/*!
571571
* Overload of makeSliceUntil for pointer based slices.
572572
*/
573573
template <typename T>
574-
inline Slice<T*> makeSliceUntil(T* ptr, size_t end) {
575-
return Slice<T*>(ptr, 0, end);
574+
Slice<T*> makeSliceUntil(T* ptr, size_t end) {
575+
return {ptr, 0, end};
576576
}
577577

578578
} // namespace Exiv2

0 commit comments

Comments
 (0)