Removed some cruft and warnings

include/internal/catch_impl.hpp

@@ -63,7 +63,6 @@ namespace Catch {
 
     BasicReporter::~BasicReporter() {}
     StreamingReporterBase::~StreamingReporterBase() {}
-    CumulativeReporterBase::~CumulativeReporterBase() {}
     ConsoleReporter::~ConsoleReporter() {}
     IRunner::~IRunner() {}
     IMutableContext::~IMutableContext() {}

include/internal/catch_interfaces_reporter.h

@@ -291,74 +291,6 @@ namespace Catch
         std::vector<TestGroupNode> groups;
     };
     
-
-
-    // !TBD: Derived helper that implements the streaming interface but holds the stats
-    // - declares a new interface where methods are called at the end of each event
-    // - this would be used by the JUnit reporter, for example.
-    // - it may be used by the basic reporter, too, but that would clear down the stack
-    //   as it goes
-    struct CumulativeReporterBase : SharedImpl<IStreamingReporter> {
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config ),
-            stream( _config.stream() )
-        {}
-
-        virtual ~CumulativeReporterBase();
-
-        virtual void testRunStarting( TestRunInfo const& _testRunInfo ) {
-//            testRunInfo = _testRunInfo;
-        }
-        virtual void testGroupStarting( GroupInfo const& _groupInfo ) {
-            testGroupNode = TestGroupNode( _groupInfo );
-        }
-
-        virtual void testCaseStarting( TestCaseInfo const& _testInfo ) {
-//            unusedTestCaseInfo = _testInfo;
-        }
-        virtual void sectionStarting( SectionInfo const& _sectionInfo ) {
-//            Ptr<ThreadedSectionInfo> sectionInfo = new ThreadedSectionInfo( _sectionInfo );
-//            if( !currentSectionInfo ) {
-//                currentSectionInfo = sectionInfo;
-//            }
-//            else {
-//                currentSectionInfo->children.push_back( sectionInfo );
-//                sectionInfo->parent = currentSectionInfo;
-//                currentSectionInfo = sectionInfo;
-//            }
-        }
-
-        virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) {
-//            currentSectionInfo = currentSectionInfo->parent;
-        }
-        virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) {
-//            unusedTestCaseInfo.reset();
-        }
-        virtual void testGroupEnded( TestGroupStats const&  _testGroupStats ) {
-//            testGroupNode-> // populate
-//            Ptr<TestGroupNode> node ( new TestGroupNode( _testGroupStats ) );
-//            unusedGroupInfo.reset();
-        }
-        virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) {
-//            currentSectionInfo.reset();
-//            unusedTestCaseInfo.reset();
-//            unusedGroupInfo.reset();
-//            testRunInfo.reset();
-        }
-
-        ReporterConfig m_config;
-//        Option<TestRunInfo> testRunInfo;
-//        Option<GroupInfo> unusedGroupInfo;
-//        Option<TestCaseInfo> unusedTestCaseInfo;
-//        Ptr<ThreadedSectionInfo> currentSectionInfo;
-//        Ptr<TestGroupNode> testGroupNode;
-        Option<TestGroupNode> testGroupNode;
-        std::ostream& stream;
-    };
-
-
-
     // Deprecated
     struct IReporter : IShared {
         virtual ~IReporter();

include/internal/catch_ptr.hpp

@@ -10,6 +10,11 @@
 
 #include "catch_common.h"
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 namespace Catch {
 
     // An intrusive reference counting smart pointer.
@@ -82,4 +87,8 @@ namespace Catch {
     
 } // end namespace Catch
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #endif // TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED

include/internal/catch_test_case_info.h

@@ -13,6 +13,11 @@
 #include <string>
 #include <set>
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 namespace Catch {
 
     struct ITestCase;
@@ -68,4 +73,8 @@ namespace Catch {
                             const SourceLineInfo& lineInfo );
 }
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED

include/reporters/catch_reporter_junit.hpp

@@ -234,7 +234,7 @@ namespace Catch {
         
     private:
         ReporterConfig m_config;
-        bool m_currentTestSuccess;
+//        bool m_currentTestSuccess;
         
         Stats m_testSuiteStats;
         Stats* m_currentStats;