Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-04 13:53:46 +0100
committerMartin Hořeňovský2019-11-05 10:45:57 +0100
commitd1cb727e85b5ff311aacd1c38567ae9b20548491 (patch)
tree543b8c7fd47050d75d4810a15404676b9a8ef0b9
parente6b9b854b57580e8a500c0b1c5ab4914ada5a570 (diff)
downloadcatch3-d1cb727e85b5ff311aacd1c38567ae9b20548491.tar.gz
Remove workaround for GCC 4.8, as it is no longer supported
Closes #1442
-rw-r--r--include/internal/catch_assertioninfo.h9
-rw-r--r--include/internal/catch_test_case_registry_impl.h1
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
};
///////////////////////////////////////////////////////////////////////////