feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SmallString: Fix ambiguity of iterators

Browse Source 
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>
This commit is contained in:
Marco Bubke
2016-06-23 15:57:26 +02:00
parent 8219188738
commit 7d342471a4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/smallstring.h
View File

@@ -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

4
src/libs/utils/smallstringliteral.h
View File

@@ -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

4
src/libs/utils/smallstringview.h
View File

@@ -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: