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

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-09-08 21:08:37 +0200
committerMartin Hořeňovský2019-09-08 21:08:37 +0200
commita156440b19c1103419b6e4d3ebbfe3c7ddb948dc (patch)
tree7bd789c30db5928e1c44cb6fab4477998d840147
parentdab0296b64483034d7b802a0635fae840ba31727 (diff)
downloadcatch3-a156440b19c1103419b6e4d3ebbfe3c7ddb948dc.tar.gz
Reinline some StringRef methods with trivial bodies
-rw-r--r--include/internal/catch_stringref.cpp8
-rw-r--r--include/internal/catch_stringref.h10
2 files changed, 8 insertions, 10 deletions
diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp
index 0c617b49..b46414ac 100644
--- a/include/internal/catch_stringref.cpp
+++ b/include/internal/catch_stringref.cpp
@@ -22,10 +22,6 @@ namespace Catch {
: StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
{}
- StringRef::operator std::string() const {
- return std::string( m_start, m_size );
- }
-
void StringRef::swap( StringRef& other ) noexcept {
std::swap( m_start, other.m_start );
std::swap( m_size, other.m_size );
@@ -72,10 +68,6 @@ namespace Catch {
return !operator==( other );
}
- auto StringRef::operator[](size_type index) const noexcept -> char {
- return m_start[index];
- }
-
auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
return os.write(str.currentData(), str.size());
}
diff --git a/include/internal/catch_stringref.h b/include/internal/catch_stringref.h
index d2152eb9..a45147da 100644
--- a/include/internal/catch_stringref.h
+++ b/include/internal/catch_stringref.h
@@ -10,6 +10,7 @@
#include <cstddef>
#include <string>
#include <iosfwd>
+#include <cassert>
namespace Catch {
@@ -79,7 +80,9 @@ namespace Catch {
return *this;
}
- explicit operator std::string() const;
+ explicit operator std::string() const {
+ return std::string(m_start, m_size);
+ }
void swap( StringRef& other ) noexcept;
@@ -87,7 +90,10 @@ namespace Catch {
auto operator == ( StringRef const& other ) const noexcept -> bool;
auto operator != ( StringRef const& other ) const noexcept -> bool;
- auto operator[] ( size_type index ) const noexcept -> char;
+ auto operator[] ( size_type index ) const noexcept -> char {
+ assert(index < m_size);
+ return m_start[index];
+ }
public: // named queries
auto empty() const noexcept -> bool {