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

Remove workaround for GCC 4.8, as it is no longer supported

Closes #1442
Commit
d1cb727e85b5ff311aacd1c38567ae9b20548491
Author
Martin Hořeňovský ·
Parents
e6b9b854b575

Files · Download .tar.gz

Changes

 include/internal/catch_assertioninfo.h           | 9 +++------
 include/internal/catch_test_case_registry_impl.h | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/internal/catch_assertioninfo.h b/include/internal/catch_assertioninfo.h
index 5f136bf7..342842c5 100644
--- a/include/internal/catch_assertioninfo.h
+++ b/include/internal/catch_assertioninfo.h
@@ -14,16 +14,13 @@
 
 namespace Catch {
 
-    struct AssertionInfo
-    {
+    struct AssertionInfo {
+        // AssertionInfo() = delete;
+
         StringRef macroName;
         SourceLineInfo lineInfo;
         StringRef capturedExpression;
         ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
     };
 
 } // end namespace Catch
diff --git a/include/internal/catch_test_case_registry_impl.h b/include/internal/catch_test_case_registry_impl.h
index 0b5144c9..f0c85987 100644
--- a/include/internal/catch_test_case_registry_impl.h
+++ b/include/internal/catch_test_case_registry_impl.h
@@ -45,7 +45,6 @@ namespace Catch {
         std::vector<TestCase> m_functions;
         mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
         mutable std::vector<TestCase> m_sortedFunctions;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
     };
 
     ///////////////////////////////////////////////////////////////////////////