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

Utils: Use constexpr instead of constexpr17

Browse Source 
Not needed anymore, we require C++17 nowadays.

Change-Id: Idea34512314d4df619f48832ea9d7b4994586c14
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
hjk
2020-07-31 11:00:19 +02:00
parent d80a83c97c
commit cdf83ee792
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/smallstringfwd.h
View File

@@ -25,12 +25,6 @@
#pragma once #pragma once
#if __cplusplus >= 201703L
#define constexpr17 constexpr
#else
#define constexpr17 inline
#endif
#if __cplusplus >= 202002L #if __cplusplus >= 202002L
#define constexpr20 constexpr #define constexpr20 constexpr
#else #else

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

@@ -54,7 +54,7 @@ public:
constexpr SmallStringView() = default; constexpr SmallStringView() = default;
constexpr17 SmallStringView(const char *characterPointer) noexcept constexpr SmallStringView(const char *characterPointer) noexcept
: m_pointer(characterPointer) : m_pointer(characterPointer)
, m_size(std::char_traits<char>::length(characterPointer)) , m_size(std::char_traits<char>::length(characterPointer))
{} {}
@@ -77,7 +77,7 @@ public:
, m_size(string.size()) , m_size(string.size())
{} {}
static constexpr17 SmallStringView fromUtf8(const char *const characterPointer) static constexpr SmallStringView fromUtf8(const char *const characterPointer)
{ {
return SmallStringView(characterPointer); return SmallStringView(characterPointer);
} }
@@ -130,12 +130,12 @@ public:
return data() + size(); return data() + size();
} }
constexpr17 const_reverse_iterator rbegin() const noexcept constexpr const_reverse_iterator rbegin() const noexcept
{ {
return const_reverse_iterator(end()); return const_reverse_iterator(end());
} }
constexpr17 const_reverse_iterator rend() const noexcept constexpr const_reverse_iterator rend() const noexcept
{ {
return const_reverse_iterator(begin()); return const_reverse_iterator(begin());
} }
@@ -147,7 +147,7 @@ public:
return QString::fromUtf8(data(), int(size())); return QString::fromUtf8(data(), int(size()));
} }
constexpr17 bool startsWith(SmallStringView subStringToSearch) const noexcept constexpr bool startsWith(SmallStringView subStringToSearch) const noexcept
{ {
if (size() >= subStringToSearch.size()) if (size() >= subStringToSearch.size())
return !std::char_traits<char>::compare(m_pointer, return !std::char_traits<char>::compare(m_pointer,
@@ -171,18 +171,18 @@ private:
size_type m_size = 0; size_type m_size = 0;
}; };
constexpr17 bool operator==(SmallStringView first, SmallStringView second) noexcept constexpr bool operator==(SmallStringView first, SmallStringView second) noexcept
{ {
return first.size() == second.size() return first.size() == second.size()
&& std::char_traits<char>::compare(first.data(), second.data(), first.size()) == 0; && std::char_traits<char>::compare(first.data(), second.data(), first.size()) == 0;
} }
constexpr17 bool operator!=(SmallStringView first, SmallStringView second) noexcept constexpr bool operator!=(SmallStringView first, SmallStringView second) noexcept
{ {
return !(first == second); return !(first == second);
} }
constexpr17 int compare(SmallStringView first, SmallStringView second) noexcept constexpr int compare(SmallStringView first, SmallStringView second) noexcept
{ {
int sizeDifference = int(first.size() - second.size()); int sizeDifference = int(first.size() - second.size());
@@ -192,12 +192,12 @@ constexpr17 int compare(SmallStringView first, SmallStringView second) noexcept
return sizeDifference; return sizeDifference;
} }
constexpr17 bool operator<(SmallStringView first, SmallStringView second) noexcept constexpr bool operator<(SmallStringView first, SmallStringView second) noexcept
{ {
return compare(first, second) < 0; return compare(first, second) < 0;
} }
constexpr17 bool operator>(SmallStringView first, SmallStringView second) noexcept constexpr bool operator>(SmallStringView first, SmallStringView second) noexcept
{ {
return second < first; return second < first;
} }