diff options
| author | Martin Hořeňovský | 2022-04-11 00:00:19 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-04-11 18:32:35 +0200 |
| commit | 8cdaebe9643f77b2e62cde01df0176d15385b12c (patch) | |
| tree | 97cc618b4ae6b3d61c7fe368da494d35df7ccec2 /src/catch2/internal | |
| parent | 1a56ba851b7a66145ffe4b9fac722a692485b973 (diff) | |
| download | catch3-8cdaebe9643f77b2e62cde01df0176d15385b12c.tar.gz | |
struct -> class normalization for various interface types
Diffstat (limited to 'src/catch2/internal')
| -rw-r--r-- | src/catch2/internal/catch_assertion_handler.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_console_colour.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_context.hpp | 12 | ||||
| -rw-r--r-- | src/catch2/internal/catch_decomposer.hpp | 8 | ||||
| -rw-r--r-- | src/catch2/internal/catch_lazy_expr.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_run_context.hpp | 6 | ||||
| -rw-r--r-- | src/catch2/internal/catch_test_case_registry_impl.hpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_test_spec_parser.hpp | 2 |
8 files changed, 19 insertions, 17 deletions
diff --git a/src/catch2/internal/catch_assertion_handler.hpp b/src/catch2/internal/catch_assertion_handler.hpp index b7c7613e..4d397766 100644 --- a/src/catch2/internal/catch_assertion_handler.hpp +++ b/src/catch2/internal/catch_assertion_handler.hpp @@ -16,7 +16,7 @@ namespace Catch { struct AssertionResultData; - struct IResultCapture; + class IResultCapture; class RunContext; struct AssertionReaction { diff --git a/src/catch2/internal/catch_console_colour.hpp b/src/catch2/internal/catch_console_colour.hpp index 7f91a5fc..bf7cb893 100644 --- a/src/catch2/internal/catch_console_colour.hpp +++ b/src/catch2/internal/catch_console_colour.hpp @@ -16,7 +16,7 @@ namespace Catch { enum class ColourMode : std::uint8_t; - struct IConfig; + class IConfig; class IStream; struct Colour { diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp index d3552448..45901739 100644 --- a/src/catch2/internal/catch_context.hpp +++ b/src/catch2/internal/catch_context.hpp @@ -10,19 +10,19 @@ namespace Catch { - struct IResultCapture; - struct IConfig; + class IResultCapture; + class IConfig; - struct IContext - { + class IContext { + public: virtual ~IContext(); // = default virtual IResultCapture* getResultCapture() = 0; virtual IConfig const* getConfig() const = 0; }; - struct IMutableContext : IContext - { + class IMutableContext : public IContext { + public: virtual ~IMutableContext(); // = default virtual void setResultCapture( IResultCapture* resultCapture ) = 0; virtual void setConfig( IConfig const* config ) = 0; diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp index a747c34c..e7dd1e9a 100644 --- a/src/catch2/internal/catch_decomposer.hpp +++ b/src/catch2/internal/catch_decomposer.hpp @@ -33,7 +33,11 @@ namespace Catch { - struct ITransientExpression { + class ITransientExpression { + bool m_isBinaryExpression; + bool m_result; + + public: auto isBinaryExpression() const -> bool { return m_isBinaryExpression; } auto getResult() const -> bool { return m_result; } virtual void streamReconstructedExpression( std::ostream &os ) const = 0; @@ -51,8 +55,6 @@ namespace Catch { // complain if it's not here :-( virtual ~ITransientExpression(); // = default; - bool m_isBinaryExpression; - bool m_result; friend std::ostream& operator<<(std::ostream& out, ITransientExpression const& expr) { expr.streamReconstructedExpression(out); return out; diff --git a/src/catch2/internal/catch_lazy_expr.hpp b/src/catch2/internal/catch_lazy_expr.hpp index e69a72ef..d4aa79d7 100644 --- a/src/catch2/internal/catch_lazy_expr.hpp +++ b/src/catch2/internal/catch_lazy_expr.hpp @@ -12,7 +12,7 @@ namespace Catch { - struct ITransientExpression; + class ITransientExpression; class LazyExpression { friend class AssertionHandler; diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp index 4441a097..cf894176 100644 --- a/src/catch2/internal/catch_run_context.hpp +++ b/src/catch2/internal/catch_run_context.hpp @@ -24,9 +24,9 @@ namespace Catch { - struct IMutableContext; - struct IGeneratorTracker; - struct IConfig; + class IMutableContext; + class IGeneratorTracker; + class IConfig; /////////////////////////////////////////////////////////////////////////// diff --git a/src/catch2/internal/catch_test_case_registry_impl.hpp b/src/catch2/internal/catch_test_case_registry_impl.hpp index 60a8f9bd..b0064cbb 100644 --- a/src/catch2/internal/catch_test_case_registry_impl.hpp +++ b/src/catch2/internal/catch_test_case_registry_impl.hpp @@ -16,7 +16,7 @@ namespace Catch { class TestCaseHandle; - struct IConfig; + class IConfig; class TestSpec; std::vector<TestCaseHandle> sortTests( IConfig const& config, std::vector<TestCaseHandle> const& unsortedTestCases ); diff --git a/src/catch2/internal/catch_test_spec_parser.hpp b/src/catch2/internal/catch_test_spec_parser.hpp index 22b288eb..75f2fd76 100644 --- a/src/catch2/internal/catch_test_spec_parser.hpp +++ b/src/catch2/internal/catch_test_spec_parser.hpp @@ -20,7 +20,7 @@ namespace Catch { - struct ITagAliasRegistry; + class ITagAliasRegistry; class TestSpecParser { enum Mode{ None, Name, QuotedName, Tag, EscapedName }; |