Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2/internal
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-11-20 23:41:57 +0100
committerMartin Hořeňovský2021-11-23 23:16:46 +0100
commitb9baae6d938133ff2fdc938053e88ccf51dd3afe (patch)
tree7028372a8fe55e39a838f68fda28a4d1b80d9ec3 /src/catch2/internal
parentc95072408fdb6e5cdff2a4d24b2eb991bc8f8ca0 (diff)
downloadcatch3-b9baae6d938133ff2fdc938053e88ccf51dd3afe.tar.gz
Cleanup StringRef impl a bit
Diffstat (limited to 'src/catch2/internal')
-rw-r--r--src/catch2/internal/catch_stringref.cpp10
-rw-r--r--src/catch2/internal/catch_stringref.hpp10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/catch2/internal/catch_stringref.cpp b/src/catch2/internal/catch_stringref.cpp
index 0aa535db..82eef686 100644
--- a/src/catch2/internal/catch_stringref.cpp
+++ b/src/catch2/internal/catch_stringref.cpp
@@ -17,12 +17,12 @@ namespace Catch {
: StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
{}
- auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+ auto StringRef::operator == ( StringRef other ) const noexcept -> bool {
return m_size == other.m_size
&& (std::memcmp( m_start, other.m_start, m_size ) == 0);
}
- bool StringRef::operator<(StringRef const& rhs) const noexcept {
+ bool StringRef::operator<(StringRef rhs) const noexcept {
if (m_size < rhs.m_size) {
return strncmp(m_start, rhs.m_start, m_size) <= 0;
}
@@ -50,8 +50,8 @@ namespace Catch {
}
}
- auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
- return os.write(str.data(), str.size());
+ auto operator << ( std::ostream& os, StringRef str ) -> std::ostream& {
+ return os.write(str.data(), static_cast<std::streamsize>(str.size()));
}
std::string operator+(StringRef lhs, StringRef rhs) {
@@ -62,7 +62,7 @@ namespace Catch {
return ret;
}
- auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+ auto operator+=( std::string& lhs, StringRef rhs ) -> std::string& {
lhs.append(rhs.data(), rhs.size());
return lhs;
}
diff --git a/src/catch2/internal/catch_stringref.hpp b/src/catch2/internal/catch_stringref.hpp
index 3d42fc25..e7f1ab70 100644
--- a/src/catch2/internal/catch_stringref.hpp
+++ b/src/catch2/internal/catch_stringref.hpp
@@ -49,8 +49,8 @@ namespace Catch {
}
public: // operators
- auto operator == ( StringRef const& other ) const noexcept -> bool;
- auto operator != (StringRef const& other) const noexcept -> bool {
+ auto operator == ( StringRef other ) const noexcept -> bool;
+ auto operator != (StringRef other) const noexcept -> bool {
return !(*this == other);
}
@@ -59,7 +59,7 @@ namespace Catch {
return m_start[index];
}
- bool operator<(StringRef const& rhs) const noexcept;
+ bool operator<(StringRef rhs) const noexcept;
public: // named queries
constexpr auto empty() const noexcept -> bool {
@@ -90,8 +90,8 @@ namespace Catch {
constexpr const_iterator end() const { return m_start + m_size; }
- friend std::string& operator += (std::string& lhs, StringRef const& sr);
- friend std::ostream& operator << (std::ostream& os, StringRef const& sr);
+ friend std::string& operator += (std::string& lhs, StringRef sr);
+ friend std::ostream& operator << (std::ostream& os, StringRef sr);
friend std::string operator+(StringRef lhs, StringRef rhs);
/**