explicit conversion from size_t to size_type

This commit is contained in:
Phil Nash 2017-06-29 16:31:05 +01:00
parent 63a8017ba7
commit 0016362f69

View File

@ -40,14 +40,14 @@ namespace Catch {
StringRef::StringRef( char const* rawChars ) noexcept StringRef::StringRef( char const* rawChars ) noexcept
: m_start( rawChars ), : m_start( rawChars ),
m_size( std::strlen( rawChars ) ) m_size( static_cast<size_type>( std::strlen( rawChars ) ) )
{} {}
StringRef::StringRef( char const* rawChars, size_type size ) noexcept StringRef::StringRef( char const* rawChars, size_type size ) noexcept
: m_start( rawChars ), : m_start( rawChars ),
m_size( size ) m_size( size )
{ {
size_type rawSize = rawChars == nullptr ? 0 : std::strlen( rawChars ); size_type rawSize = rawChars == nullptr ? 0 : static_cast<size_type>( std::strlen( rawChars ) );
if( rawSize < size ) if( rawSize < size )
size = rawSize; size = rawSize;
} }