Fix merge mishap (duplicated catch_reporter_multi header)

3 files changed, 2 insertions, 65 deletions

diff --git a/include/reporters/catch_reporter_multi.cpp b/include/reporters/catch_reporter_multi.cpp
index f66b5eee..b21672c3 100644
--- a/include/reporters/catch_reporter_multi.cpp
+++ b/include/reporters/catch_reporter_multi.cpp
@@ -18,7 +18,7 @@ namespace Catch {
         return m_reporters[0]->getPreferences();
     }
 
-    std::set<Verbosity> getSupportedVerbosities() {
+    std::set<Verbosity> MultipleReporters::getSupportedVerbosities() {
         return { };
     }
 
diff --git a/include/reporters/catch_reporter_multi.h b/include/reporters/catch_reporter_multi.h
index 047bb110..ab6d5077 100644
--- a/include/reporters/catch_reporter_multi.h
+++ b/include/reporters/catch_reporter_multi.h
@@ -22,6 +22,7 @@ namespace Catch {
 
         virtual void noMatchingTestCases( std::string const& spec ) override;
 
+    static std::set<Verbosity> getSupportedVerbosities();
 
         virtual void testRunStarting( TestRunInfo const& testRunInfo ) override;
 
diff --git a/include/reporters/catch_reporter_multi.hpp b/include/reporters/catch_reporter_multi.hpp
deleted file mode 100644
index 59359240..00000000
--- a/include/reporters/catch_reporter_multi.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Created by Phil on 5/08/2015.
- *  Copyright 2015 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED
-
-#include "../internal/catch_interfaces_reporter.h"
-
-namespace Catch {
-
-class MultipleReporters : public IStreamingReporter {
-    typedef std::vector<IStreamingReporterPtr> Reporters;
-    Reporters m_reporters;
-
-public:
-    void add( IStreamingReporterPtr&& reporter );
-
-public: // IStreamingReporter
-
-    virtual ReporterPreferences getPreferences() const override;
-
-    static std::set<Verbosity> getSupportedVerbosities();
-
-    virtual void noMatchingTestCases( std::string const& spec ) override;
-
-
-    virtual void testRunStarting( TestRunInfo const& testRunInfo ) override;
-
-    virtual void testGroupStarting( GroupInfo const& groupInfo ) override;
-
-
-    virtual void testCaseStarting( TestCaseInfo const& testInfo ) override;
-
-    virtual void sectionStarting( SectionInfo const& sectionInfo ) override;
-
-
-    virtual void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-
-    // The return value indicates if the messages buffer should be cleared:
-    virtual bool assertionEnded( AssertionStats const& assertionStats ) override;
-
-    virtual void sectionEnded( SectionStats const& sectionStats ) override;
-
-    virtual void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-
-    virtual void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-
-    virtual void testRunEnded( TestRunStats const& testRunStats ) override;
-
-
-    virtual void skipTest( TestCaseInfo const& testInfo ) override;
-
-    virtual bool isMulti() const override;
-
-};
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED