diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp index 107502f3..73204f1f 100644 --- a/include/catch_runner.hpp +++ b/include/catch_runner.hpp @@ -83,7 +83,7 @@ namespace Catch { << "\t-o, --out |<%stream name>\n" << "\t-s, --success\n" << "\t-b, --break\n" - << "\t-n, --name \n\n" + << "\t-n, --name \n" << "\t-c, --cutoff [#]\n\n" << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl; } diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.hpp index 75358563..52be1171 100644 --- a/include/internal/catch_commandline.hpp +++ b/include/internal/catch_commandline.hpp @@ -17,7 +17,7 @@ namespace Catch { public: Command(){} - Command( const std::string& name ) : m_name( name ) {} + explicit Command( const std::string& name ) : m_name( name ) {} Command& operator += ( const std::string& arg ) { m_args.push_back( arg ); @@ -61,7 +61,7 @@ namespace Catch { class CommandParser { public: - CommandParser( int argc, char const * const * argv ) : m_argc( argc ), m_argv( argv ) {} + CommandParser( int argc, char const * const * argv ) : m_argc( static_cast( argc ) ), m_argv( argv ) {} Command find( const std::string& arg1, const std::string& arg2, const std::string& arg3 ) const { return find( arg1 ) + find( arg2 ) + find( arg3 ); @@ -85,7 +85,7 @@ namespace Catch { return command; } - int m_argc; + std::size_t m_argc; char const * const * m_argv; }; diff --git a/include/internal/catch_runner_impl.hpp b/include/internal/catch_runner_impl.hpp index 5f54dca9..6548a06d 100644 --- a/include/internal/catch_runner_impl.hpp +++ b/include/internal/catch_runner_impl.hpp @@ -230,7 +230,7 @@ namespace Catch { private: bool aborting() const { - return m_totals.assertions.failed == m_config.getCutoff(); + return m_totals.assertions.failed == static_cast( m_config.getCutoff() ); } ResultAction::Value actOnCurrentResult() { diff --git a/projects/SelfTest/ConditionTests.cpp b/projects/SelfTest/ConditionTests.cpp index 41ce392d..cb56bfa8 100644 --- a/projects/SelfTest/ConditionTests.cpp +++ b/projects/SelfTest/ConditionTests.cpp @@ -192,7 +192,7 @@ TEST_CASE( "./succeeding/conditions/int literals", TEST_CASE( "./succeeding/conditions//long_to_unsigned_x", "comparisons between int variables" ) { - long long_var = 1L; + long long_var = 1L; unsigned char unsigned_char_var = 1; unsigned short unsigned_short_var = 1; unsigned int unsigned_int_var = 1; diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj index e8e4ddce..ffba9c4d 100644 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj +++ b/projects/XCode4/CatchSelfTest/CatchSelfTest.xcodeproj/project.pbxproj @@ -360,8 +360,8 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; + CLANG_CXX_LIBRARY = "compiler-default"; CLANG_WARN_CXX0X_EXTENSIONS = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -390,7 +390,7 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_PEDANTIC = YES; GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; @@ -407,8 +407,8 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; + CLANG_CXX_LIBRARY = "compiler-default"; CLANG_WARN_CXX0X_EXTENSIONS = YES; CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; @@ -431,7 +431,7 @@ GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_PEDANTIC = YES; GCC_WARN_SHADOW = YES; - GCC_WARN_SIGN_COMPARE = NO; + GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES;