Untemplatize reporter bases

This commit is contained in:
Martin Hořeňovský
2019-07-02 20:01:18 +02:00
parent 4f47d1c6c1
commit c46deee024
10 changed files with 14 additions and 14 deletions

View File

@@ -27,7 +27,6 @@ namespace Catch {
std::string serializeFilters( std::vector<std::string> const& container );
template<typename DerivedT>
struct StreamingReporterBase : IStreamingReporter {
StreamingReporterBase( ReporterConfig const& _config )
@@ -41,7 +40,7 @@ namespace Catch {
return m_reporterPrefs;
}
~StreamingReporterBase() override = default;
~StreamingReporterBase() override;
void noMatchingTestCases(std::string const&) override {}
@@ -93,7 +92,6 @@ namespace Catch {
ReporterPreferences m_reporterPrefs;
};
template<typename DerivedT>
struct CumulativeReporterBase : IStreamingReporter {
template<typename T, typename ChildNodeT>
struct Node {
@@ -106,7 +104,6 @@ namespace Catch {
};
struct SectionNode {
explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
virtual ~SectionNode() = default;
bool operator == (SectionNode const& other) const {
return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
@@ -148,7 +145,7 @@ namespace Catch {
{
m_reporterPrefs.shouldRedirectStdOut = false;
}
~CumulativeReporterBase() override = default;
~CumulativeReporterBase() override;
ReporterPreferences getPreferences() const override {
return m_reporterPrefs;
@@ -256,7 +253,7 @@ namespace Catch {
}
struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
struct TestEventListenerBase : StreamingReporterBase {
TestEventListenerBase( ReporterConfig const& _config );
void assertionStarting(AssertionInfo const&) override;