3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Closes #1442
This commit is contained in:
Martin Hořeňovský 2019-11-04 13:53:46 +01:00
parent e6b9b854b5
commit d1cb727e85
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/internal/catch_assertioninfo.h
View File

@ -14,16 +14,13 @@
namespace Catch { namespace Catch {
struct AssertionInfo struct AssertionInfo {
{ // AssertionInfo() = delete;
StringRef macroName; StringRef macroName;
SourceLineInfo lineInfo; SourceLineInfo lineInfo;
StringRef capturedExpression; StringRef capturedExpression;
ResultDisposition::Flags resultDisposition; 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 } // end namespace Catch

1
include/internal/catch_test_case_registry_impl.h
View File

@ -45,7 +45,6 @@ namespace Catch {
std::vector<TestCase> m_functions; std::vector<TestCase> m_functions;
mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder; mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
mutable std::vector<TestCase> m_sortedFunctions; mutable std::vector<TestCase> m_sortedFunctions;
std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
}; };
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////