diff options
| author | Phil Nash | 2017-11-17 18:33:34 +0000 |
|---|---|---|
| committer | Phil Nash | 2017-11-17 18:38:54 +0000 |
| commit | b0c379f62122c95e7494fd6349b3804d58906793 (patch) | |
| tree | 4c9e6f4c4e425a29ac7971c79f9f79e5d14aee48 /include/internal/catch_stringref.cpp | |
| parent | c443afcca01dababeb9f2e59675c3b290c80a749 (diff) | |
| download | catch3-b0c379f62122c95e7494fd6349b3804d58906793.tar.gz | |
Inlined StringRef ctors/ dtor and size() and empty()
Diffstat (limited to 'include/internal/catch_stringref.cpp')
| -rw-r--r-- | include/internal/catch_stringref.cpp | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp index f82e60c3..5a15bbf6 100644 --- a/include/internal/catch_stringref.cpp +++ b/include/internal/catch_stringref.cpp @@ -14,63 +14,8 @@ #include "catch_stringref.h" #include <ostream> -#include <cstring> -#include <stdexcept> - - namespace Catch { - namespace { - - auto getEmptyStringRef() -> StringRef { - static StringRef s_emptyStringRef(""); - return s_emptyStringRef; - } - - char const* enforceNonNull(char const* ptr) { - if (ptr == nullptr) { - std::abort(); - } - return ptr; - } - - } - - StringRef::StringRef() noexcept - : StringRef( getEmptyStringRef() ) - {} - - StringRef::StringRef( StringRef const& other ) noexcept - : m_start( other.m_start ), - m_size( other.m_size ) - {} - - StringRef::StringRef( StringRef&& other ) noexcept - : m_start( other.m_start ), - m_size( other.m_size ), - m_data( other.m_data ) - { - other.m_data = nullptr; - } - - StringRef::StringRef(char const* rawChars) noexcept - : m_start( enforceNonNull(rawChars) ), - m_size( static_cast<size_type>(std::strlen(rawChars))) - {} - - StringRef::StringRef( char const* rawChars, size_type size ) noexcept - : m_start( rawChars ), - m_size( size ) - {} - - StringRef::StringRef( std::string const& stdString ) noexcept - : m_start( stdString.c_str() ), - m_size( stdString.size() ) - {} - - StringRef::~StringRef() noexcept { - delete[] m_data; - } auto StringRef::operator = ( StringRef other ) noexcept -> StringRef& { swap( other ); @@ -129,13 +74,6 @@ namespace Catch { return m_start[index]; } - auto StringRef::empty() const noexcept -> bool { - return m_size == 0; - } - - auto StringRef::size() const noexcept -> size_type { - return m_size; - } auto StringRef::numberOfCharacters() const noexcept -> size_type { size_type noChars = m_size; // Make adjustments for uft encodings |