diff options
| author | Martin Hořeňovský | 2017-07-19 09:50:08 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-07-19 09:50:08 +0200 |
| commit | 7a22bad76340f8b48094b46bc586e76ac9ea93ac (patch) | |
| tree | e6583084ec7ca201c9b52064002c43546d63f1e4 /include | |
| parent | 8ebe94ca2ea1e6ae7765f65d2f3aec08c9a85ae2 (diff) | |
| download | catch3-7a22bad76340f8b48094b46bc586e76ac9ea93ac.tar.gz | |
Addressed some static analysis warnings
Based on findings in #957
Diffstat (limited to 'include')
| -rw-r--r-- | include/catch_session.hpp | 4 | ||||
| -rw-r--r-- | include/external/clara.h | 2 | ||||
| -rw-r--r-- | include/internal/catch_approx.hpp | 7 | ||||
| -rw-r--r-- | include/internal/catch_common.h | 4 | ||||
| -rw-r--r-- | include/internal/catch_evaluate.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_matchers.hpp | 10 | ||||
| -rw-r--r-- | include/internal/catch_notimplemented_exception.h | 1 | ||||
| -rw-r--r-- | include/internal/catch_result_builder.h | 4 | ||||
| -rw-r--r-- | include/internal/catch_tostring.h | 2 |
9 files changed, 15 insertions, 23 deletions
diff --git a/include/catch_session.hpp b/include/catch_session.hpp index a501634d..a24c0c2c 100644 --- a/include/catch_session.hpp +++ b/include/catch_session.hpp @@ -95,11 +95,11 @@ namespace Catch { if( lastSlash != std::string::npos ) filename = filename.substr( lastSlash+1 ); - std::string::size_type lastDot = filename.find_last_of( "." ); + std::string::size_type lastDot = filename.find_last_of( '.' ); if( lastDot != std::string::npos ) filename = filename.substr( 0, lastDot ); - tags.insert( "#" + filename ); + tags.insert( '#' + filename ); setTags( test, tags ); } } diff --git a/include/external/clara.h b/include/external/clara.h index bf758eb5..a641dda5 100644 --- a/include/external/clara.h +++ b/include/external/clara.h @@ -151,7 +151,7 @@ namespace Tbc { return oss.str(); } - inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { + friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) { for( Text::const_iterator it = _text.begin(), itEnd = _text.end(); it != itEnd; ++it ) { if( it != _text.begin() ) diff --git a/include/internal/catch_approx.hpp b/include/internal/catch_approx.hpp index fc681436..663dabf0 100644 --- a/include/internal/catch_approx.hpp +++ b/include/internal/catch_approx.hpp @@ -29,13 +29,6 @@ namespace Detail { m_value( value ) {} - Approx( Approx const& other ) - : m_epsilon( other.m_epsilon ), - m_margin( other.m_margin ), - m_scale( other.m_scale ), - m_value( other.m_value ) - {} - static Approx custom() { return Approx( 0 ); } diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h index d325a089..f1ce01ea 100644 --- a/include/internal/catch_common.h +++ b/include/internal/catch_common.h @@ -61,14 +61,14 @@ namespace Catch { }; template<typename ContainerT> - inline void deleteAll( ContainerT& container ) { + void deleteAll( ContainerT& container ) { typename ContainerT::const_iterator it = container.begin(); typename ContainerT::const_iterator itEnd = container.end(); for(; it != itEnd; ++it ) delete *it; } template<typename AssociativeContainerT> - inline void deleteAllValues( AssociativeContainerT& container ) { + void deleteAllValues( AssociativeContainerT& container ) { typename AssociativeContainerT::const_iterator it = container.begin(); typename AssociativeContainerT::const_iterator itEnd = container.end(); for(; it != itEnd; ++it ) diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp index 87fcc17f..36b4cd5a 100644 --- a/include/internal/catch_evaluate.hpp +++ b/include/internal/catch_evaluate.hpp @@ -37,7 +37,7 @@ namespace Internal { template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } }; template<typename T> - inline T& opCast(T const& t) { return const_cast<T&>(t); } + T& opCast(T const& t) { return const_cast<T&>(t); } // nullptr_t support based on pull request #154 from Konstantin Baumann #ifdef CATCH_CONFIG_CPP11_NULLPTR @@ -48,7 +48,7 @@ namespace Internal { // So the compare overloads can be operator agnostic we convey the operator as a template // enum, which is used to specialise an Evaluator for doing the comparison. template<typename T1, typename T2, Operator Op> - class Evaluator{}; + struct Evaluator{}; template<typename T1, typename T2> struct Evaluator<T1, T2, IsEqualTo> { diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp index 2193c540..7c00e9c2 100644 --- a/include/internal/catch_matchers.hpp +++ b/include/internal/catch_matchers.hpp @@ -147,23 +147,23 @@ namespace Matchers { // This allows the types to be inferred // - deprecated: prefer ||, && and ! template<typename T> - inline Impl::MatchNotOf<T> Not( Impl::MatcherBase<T> const& underlyingMatcher ) { + Impl::MatchNotOf<T> Not( Impl::MatcherBase<T> const& underlyingMatcher ) { return Impl::MatchNotOf<T>( underlyingMatcher ); } template<typename T> - inline Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) { + Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) { return Impl::MatchAllOf<T>() && m1 && m2; } template<typename T> - inline Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) { + Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) { return Impl::MatchAllOf<T>() && m1 && m2 && m3; } template<typename T> - inline Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) { + Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) { return Impl::MatchAnyOf<T>() || m1 || m2; } template<typename T> - inline Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) { + Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) { return Impl::MatchAnyOf<T>() || m1 || m2 || m3; } diff --git a/include/internal/catch_notimplemented_exception.h b/include/internal/catch_notimplemented_exception.h index 128fff28..a448268d 100644 --- a/include/internal/catch_notimplemented_exception.h +++ b/include/internal/catch_notimplemented_exception.h @@ -16,7 +16,6 @@ namespace Catch { { public: NotImplementedException( SourceLineInfo const& lineInfo ); - NotImplementedException( NotImplementedException const& ) {} virtual ~NotImplementedException() CATCH_NOEXCEPT {} diff --git a/include/internal/catch_result_builder.h b/include/internal/catch_result_builder.h index 995be818..3ee1fca6 100644 --- a/include/internal/catch_result_builder.h +++ b/include/internal/catch_result_builder.h @@ -111,7 +111,7 @@ namespace Catch { namespace Catch { template<typename T> - inline ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) { + ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) { return ExpressionLhs<T const&>( *this, operand ); } @@ -120,7 +120,7 @@ namespace Catch { } template<typename ArgT, typename MatcherT> - inline void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher, + void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher, char const* matcherString ) { MatchExpression<ArgT const&, MatcherT const&> expr( arg, matcher, matcherString ); setResultType( matcher.match( arg ) ); diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 93b93c4d..01d518a1 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -153,7 +153,7 @@ namespace Detail { std::string rawMemoryToString( const void *object, std::size_t size ); template<typename T> - inline std::string rawMemoryToString( const T& object ) { + std::string rawMemoryToString( const T& object ) { return rawMemoryToString( &object, sizeof(object) ); } |