From 03afbdfec9ce61cdb93f126d805b78bce9bbbe96 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 29 Jun 2017 11:47:09 +0100 Subject: [PATCH] Made more of StringRef noexcept --- include/internal/catch_stringref.cpp | 12 ++++++------ include/internal/catch_stringref.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/internal/catch_stringref.cpp b/include/internal/catch_stringref.cpp index d577d3af..147564de 100644 --- a/include/internal/catch_stringref.cpp +++ b/include/internal/catch_stringref.cpp @@ -17,11 +17,11 @@ namespace Catch { StringRef StringRef::s_emptyStringRef = ""; - StringRef::StringRef() + StringRef::StringRef() noexcept : StringRef( s_emptyStringRef ) {} - StringRef::StringRef( StringRef const& other ) + StringRef::StringRef( StringRef const& other ) noexcept : m_start( other.m_start ), m_size( other.m_size ), m_data( other.m_data ) @@ -38,12 +38,12 @@ namespace Catch { other.m_data = nullptr; } - StringRef::StringRef( char const* rawChars ) + StringRef::StringRef( char const* rawChars ) noexcept : m_start( rawChars ), m_size( std::strlen( rawChars ) ) {} - StringRef::StringRef( char const* rawChars, size_type size ) + StringRef::StringRef( char const* rawChars, size_type size ) noexcept : m_start( rawChars ), m_size( size ) { @@ -52,7 +52,7 @@ namespace Catch { size = rawSize; } - StringRef::StringRef( String const& other ) + StringRef::StringRef( String const& other ) noexcept : m_start( other.c_str() ), m_size( other.size() ), m_data( nullptr ) @@ -71,7 +71,7 @@ namespace Catch { m_data->release(); } - auto StringRef::operator = ( StringRef other ) -> StringRef& { + auto StringRef::operator = ( StringRef other ) noexcept -> StringRef& { swap( other ); return *this; } diff --git a/include/internal/catch_stringref.h b/include/internal/catch_stringref.h index a0d8200b..1cf5670f 100644 --- a/include/internal/catch_stringref.h +++ b/include/internal/catch_stringref.h @@ -36,16 +36,16 @@ namespace Catch { void takeOwnership(); public: // construction/ assignment - StringRef(); - StringRef( StringRef const& other ); + StringRef() noexcept; + StringRef( StringRef const& other ) noexcept; StringRef( StringRef&& other ) noexcept; - StringRef( char const* rawChars ); - StringRef( char const* rawChars, size_type size ); - StringRef( String const& other ); + StringRef( char const* rawChars ) noexcept; + StringRef( char const* rawChars, size_type size ) noexcept; + StringRef( String const& other ) noexcept; StringRef( String&& other ) noexcept; ~StringRef() noexcept; - auto operator = ( StringRef other ) -> StringRef&; + auto operator = ( StringRef other ) noexcept -> StringRef&; void swap( StringRef& other ) noexcept;