Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Fix compiler warnings

Fix base classes without virtual destructors and missing initialisors.
Commit
6d18d4b189ecc3fa2900fc4c61aeb5b80f38ae13
Author
Wichert Akkerman ·
Parents
98a21bce5da3

Files · Download .tar.gz

Changes

 include/internal/catch_capture.hpp        |  5 +++--
 include/internal/catch_common.h           |  1 +
 include/internal/catch_resultinfo.hpp     | 16 +++++++++++++++-
 include/internal/catch_section.hpp        |  2 ++
 include/internal/catch_test_case_info.hpp |  6 +++++-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 51e9d999..d348a7a8 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -559,7 +559,8 @@ public:
         const char* expr = "",
         bool isNot = false
     )
-    : m_result( expr, isNot, filename, line, macroName )
+    : m_result( expr, isNot, filename, line, macroName ),
+      m_messageStream()
     {}
     
     ///////////////////////////////////////////////////////////////////////////
@@ -659,7 +660,7 @@ class ScopedInfo
 public:
     ///////////////////////////////////////////////////////////////////////////
     ScopedInfo
-    ()
+    () : m_oss()
     {
         Hub::getResultCapture().pushScopedInfo( this );
     }
diff --git a/include/internal/catch_common.h b/include/internal/catch_common.h
index d0181d19..ea2c53f0 100644
--- a/include/internal/catch_common.h
+++ b/include/internal/catch_common.h
@@ -38,6 +38,7 @@ namespace Catch
 		void operator = ( const NonCopyable& );
 	protected:
 		NonCopyable(){}
+		virtual ~NonCopyable() {}
 	};
     
     typedef char NoType;
diff --git a/include/internal/catch_resultinfo.hpp b/include/internal/catch_resultinfo.hpp
index 016ec8c2..258cc47c 100644
--- a/include/internal/catch_resultinfo.hpp
+++ b/include/internal/catch_resultinfo.hpp
@@ -24,7 +24,14 @@ namespace Catch
         ///////////////////////////////////////////////////////////////////////////
         ResultInfo
         ()
-        :   m_line( 0 ),
+        :   m_macroName(),
+            m_filename(),
+            m_line( 0 ),
+            m_expr(),
+            m_lhs(),
+            m_rhs(),
+            m_op(),
+            m_message(),
             m_result( ResultWas::Unknown ),
             m_isNot( false )
         {}
@@ -44,6 +51,8 @@ namespace Catch
             m_filename( filename ),
             m_line( line ),
             m_expr( expr ),
+	    m_lhs(),
+	    m_rhs(),
             m_op( isNotExpression( expr ) ? "!" : "" ),
             m_message( message ),
             m_result( result ),
@@ -53,6 +62,11 @@ namespace Catch
                 m_expr = "!" + m_expr;
         }
         
+        ///////////////////////////////////////////////////////////////////////////
+	virtual ~ResultInfo
+        ()
+	{
+	}
         ///////////////////////////////////////////////////////////////////////////
         bool ok
         ()
diff --git a/include/internal/catch_section.hpp b/include/internal/catch_section.hpp
index 084aa21d..c953aba8 100644
--- a/include/internal/catch_section.hpp
+++ b/include/internal/catch_section.hpp
@@ -31,6 +31,8 @@ namespace Catch
             std::size_t line
         )
         :   m_name( name ),
+            m_successes(0),
+            m_failures(0),
             m_sectionIncluded( Hub::getResultCapture().sectionStarted( name, description, filename, line, m_successes, m_failures ) )
         {
         }
diff --git a/include/internal/catch_test_case_info.hpp b/include/internal/catch_test_case_info.hpp
index 4e88bc4f..e27a084d 100644
--- a/include/internal/catch_test_case_info.hpp
+++ b/include/internal/catch_test_case_info.hpp
@@ -42,7 +42,11 @@ namespace Catch
         ///////////////////////////////////////////////////////////////////////
         TestCaseInfo
         ()
-        :   m_test( NULL )
+        :   m_test( NULL ),
+            m_name(),
+            m_description(),
+            m_filename(),
+            m_line( 0 )
         {
         }