diff options
| author | Martin Hořeňovský | 2020-05-10 18:24:53 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-05-10 20:20:56 +0200 |
| commit | d5e08a4beb09a8c1affb6d145b1a7b2805a9bb2a (patch) | |
| tree | c74a3b9fc62a8aeef2c9f819ae58d904b7c183e7 /src/catch2 | |
| parent | ed967fd7fcb0f1d995d11ebf1d7d4106d582d43c (diff) | |
| download | catch3-d5e08a4beb09a8c1affb6d145b1a7b2805a9bb2a.tar.gz | |
Rename catch_assertionhandler -> catch_assertion_handler
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/catch_all.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/catch_assertion_result.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_assertion_handler.cpp (renamed from src/catch2/internal/catch_assertionhandler.cpp) | 6 | ||||
| -rw-r--r-- | src/catch2/internal/catch_assertion_handler.hpp (renamed from src/catch2/internal/catch_assertionhandler.hpp) | 4 | ||||
| -rw-r--r-- | src/catch2/internal/catch_exception_translator_registry.cpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_run_context.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_test_macro_impl.hpp | 2 |
7 files changed, 9 insertions, 11 deletions
diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp index e39204aa..3920e822 100644 --- a/src/catch2/catch_all.hpp +++ b/src/catch2/catch_all.hpp @@ -37,7 +37,7 @@ #include <catch2/catch_version_macros.hpp> #include <catch2/generators/catch_generators_all.hpp> #include <catch2/interfaces/catch_interfaces_all.hpp> -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <catch2/internal/catch_clara.hpp> #include <catch2/internal/catch_clara_upstream.hpp> #include <catch2/internal/catch_commandline.hpp> diff --git a/src/catch2/catch_assertion_result.hpp b/src/catch2/catch_assertion_result.hpp index 1afcf7c9..56b3d1cb 100644 --- a/src/catch2/catch_assertion_result.hpp +++ b/src/catch2/catch_assertion_result.hpp @@ -13,7 +13,7 @@ #include <catch2/internal/catch_result_type.hpp> #include <catch2/internal/catch_common.hpp> #include <catch2/internal/catch_stringref.hpp> -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> namespace Catch { diff --git a/src/catch2/internal/catch_assertionhandler.cpp b/src/catch2/internal/catch_assertion_handler.cpp index b16d356d..e21294d5 100644 --- a/src/catch2/internal/catch_assertionhandler.cpp +++ b/src/catch2/internal/catch_assertion_handler.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <catch2/catch_assertion_result.hpp> #include <catch2/interfaces/catch_interfaces_runner.hpp> #include <catch2/interfaces/catch_interfaces_config.hpp> @@ -32,10 +32,6 @@ namespace Catch { LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {} - LazyExpression::operator bool() const { - return m_transientExpression != nullptr; - } - auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& { if( lazyExpr.m_isNegated ) os << "!"; diff --git a/src/catch2/internal/catch_assertionhandler.hpp b/src/catch2/internal/catch_assertion_handler.hpp index b3bf031d..0512f17f 100644 --- a/src/catch2/internal/catch_assertionhandler.hpp +++ b/src/catch2/internal/catch_assertion_handler.hpp @@ -31,7 +31,9 @@ namespace Catch { LazyExpression( LazyExpression const& other ); LazyExpression& operator = ( LazyExpression const& ) = delete; - explicit operator bool() const; + explicit operator bool() const { + return m_transientExpression != nullptr; + } friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&; }; diff --git a/src/catch2/internal/catch_exception_translator_registry.cpp b/src/catch2/internal/catch_exception_translator_registry.cpp index b09dc05f..d99ec839 100644 --- a/src/catch2/internal/catch_exception_translator_registry.cpp +++ b/src/catch2/internal/catch_exception_translator_registry.cpp @@ -7,7 +7,7 @@ */ #include <catch2/internal/catch_exception_translator_registry.hpp> -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <catch2/internal/catch_compiler_capabilities.hpp> #include <catch2/internal/catch_enforce.hpp> diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp index bfbd8bcf..10e50b7b 100644 --- a/src/catch2/internal/catch_run_context.hpp +++ b/src/catch2/internal/catch_run_context.hpp @@ -20,7 +20,7 @@ #include <catch2/catch_totals.hpp> #include <catch2/catch_test_spec.hpp> #include <catch2/internal/catch_test_case_tracker.hpp> -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <string> diff --git a/src/catch2/internal/catch_test_macro_impl.hpp b/src/catch2/internal/catch_test_macro_impl.hpp index effd5884..07d0a7d8 100644 --- a/src/catch2/internal/catch_test_macro_impl.hpp +++ b/src/catch2/internal/catch_test_macro_impl.hpp @@ -8,7 +8,7 @@ #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED -#include <catch2/internal/catch_assertionhandler.hpp> +#include <catch2/internal/catch_assertion_handler.hpp> #include <catch2/interfaces/catch_interfaces_capture.hpp> #include <catch2/internal/catch_stringref.hpp> |