diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2016-06-23 15:57:26 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2016-06-23 14:08:43 +0000 |
| commit | 7d342471a4a03b99c2545ce0f0a10561b19a041e (patch) | |
| tree | 284a26073ca95d2f32d15497d814ff67ac95c58b | |
| parent | 8219188738ebdfaffc75b3d7363e8f423e1f4def (diff) | |
| download | qt-creator-7d342471a4a03b99c2545ce0f0a10561b19a041e.tar.gz | |
SmallString: Fix ambiguity of iterators
std::size_t is a undefined unsigned integer type and std::ptrdiff_t is a
undefined signed integer type. So sometimes the compiler doesn't know
which to choose because both could represent a integer.
Change-Id: I669cd44c6f16854dfe3f3cc44edbfc422e1cbd6a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
| -rw-r--r-- | src/libs/utils/smallstring.h | 4 | ||||
| -rw-r--r-- | src/libs/utils/smallstringliteral.h | 4 | ||||
| -rw-r--r-- | src/libs/utils/smallstringview.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h index 6c815c7ebf..1c6516a3c3 100644 --- a/src/libs/utils/smallstring.h +++ b/src/libs/utils/smallstring.h @@ -267,12 +267,12 @@ public: reverse_iterator rbegin() noexcept { - return reverse_iterator(end() - 1l); + return reverse_iterator(end() - static_cast<std::size_t>(1)); } reverse_iterator rend() noexcept { - return reverse_iterator(begin() - 1l); + return reverse_iterator(begin() - static_cast<std::size_t>(1)); } const_iterator begin() const noexcept diff --git a/src/libs/utils/smallstringliteral.h b/src/libs/utils/smallstringliteral.h index 0f631d03e6..47c7dab33b 100644 --- a/src/libs/utils/smallstringliteral.h +++ b/src/libs/utils/smallstringliteral.h @@ -90,12 +90,12 @@ public: const_reverse_iterator rbegin() const noexcept { - return const_reverse_iterator(end() - 1l); + return const_reverse_iterator(end() - static_cast<std::size_t>(1)); } const_reverse_iterator rend() const noexcept { - return const_reverse_iterator(begin() - 1l); + return const_reverse_iterator(begin() - static_cast<std::size_t>(1)); } constexpr static diff --git a/src/libs/utils/smallstringview.h b/src/libs/utils/smallstringview.h index 204a93ebfc..c0cb4aedbb 100644 --- a/src/libs/utils/smallstringview.h +++ b/src/libs/utils/smallstringview.h @@ -106,12 +106,12 @@ public: const_reverse_iterator rbegin() const noexcept { - return const_reverse_iterator(end() - 1l); + return const_reverse_iterator(end() - static_cast<std::size_t>(1)); } const_reverse_iterator rend() const noexcept { - return const_reverse_iterator(begin() - 1l); + return const_reverse_iterator(begin() - static_cast<std::size_t>(1)); } private: |