catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Removed superfluous inline specifications
- Commit
d7ff62430a009cca04dcdb10a320dd6162f2a3d2- Author
- Martin Hořeňovský ·
- Parents
edbe12276143
Changes
include/internal/catch_evaluate.hpp | 2 +- include/internal/catch_matchers.hpp | 10 +++++----- include/internal/catch_result_builder.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/internal/catch_evaluate.hpp b/include/internal/catch_evaluate.hpp index e1d2505f..31be0dcf 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 inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; } diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.hpp index ef039aa9..8131b225 100644 --- a/include/internal/catch_matchers.hpp +++ b/include/internal/catch_matchers.hpp @@ -155,23 +155,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_result_builder.h b/include/internal/catch_result_builder.h index e8de6735..1d822361 100644 --- a/include/internal/catch_result_builder.h +++ b/include/internal/catch_result_builder.h @@ -99,7 +99,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 ); } @@ -108,7 +108,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 ) );