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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2017-06-29 11:47:09 +0100
committerPhil Nash2017-06-29 11:47:09 +0100
commit03afbdfec9ce61cdb93f126d805b78bce9bbbe96 (patch)
treee06790dd3b1b5a97a0337fc7fc431af5aabf20f9 /include
parentf9ce8fd03b4fc99121262e5b55465332b8c1957a (diff)
downloadcatch3-03afbdfec9ce61cdb93f126d805b78bce9bbbe96.tar.gz
Made more of StringRef noexcept
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_stringref.cpp12
-rw-r--r--include/internal/catch_stringref.h12
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;