StringRef conversions to/ from std::string

1 files changed, 9 insertions, 3 deletions

diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp
index 44db6858..9a1eaf4c 100644
--- a/include/internal/catch_stringref.cpp
+++ b/include/internal/catch_stringref.cpp
@@ -60,8 +60,7 @@ namespace Catch {
     
     StringRef::StringRef( String const& other ) noexcept
     :   m_start( other.c_str() ),
-        m_size( other.size() ),
-        m_data( nullptr )
+        m_size( other.size() )
     {}
     
     StringRef::StringRef( String&& str ) noexcept
@@ -71,7 +70,11 @@ namespace Catch {
     {
         str.m_data = StringData::getEmpty();
     }
-    
+    StringRef::StringRef( std::string const& stdString ) noexcept
+    :   m_start( stdString.c_str() ),
+        m_size( stdString.size() )
+    {}
+
     StringRef::~StringRef() noexcept {
         if( isOwned() )
             m_data->release();
@@ -81,6 +84,9 @@ namespace Catch {
         swap( other );
         return *this;
     }
+    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 );