Minor tidy up

This commit is contained in:
Phil Nash 2013-03-21 08:58:22 +00:00
parent 444f4ddc60
commit 49d7ce40e8
3 changed files with 4 additions and 4 deletions

View File

@ -53,11 +53,11 @@ namespace Catch {
}
}
if( m_stringToMatch[0] == '*' ) {
if( startsWith( m_stringToMatch, "*" ) ) {
m_stringToMatch = m_stringToMatch.substr( 1 );
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtStart );
}
if( m_stringToMatch[m_stringToMatch.size()-1] == '*' ) {
if( endsWith( m_stringToMatch, "*" ) ) {
m_stringToMatch = m_stringToMatch.substr( 0, m_stringToMatch.size()-1 );
m_wildcardPosition = (WildcardPosition)( m_wildcardPosition | WildcardAtEnd );
}

View File

@ -204,7 +204,7 @@ TEST_CASE( "./succeeding/conditions/int literals",
// Disable warnings about sign conversions for the next two tests
// (as we are deliberately invoking them)
// - Current only disabled for GCC/ LLVM. Should add VC++ too
// - Currently only disabled for GCC/ LLVM. Should add VC++ too
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare"