feedc0de/Catch2
1
0 Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Merge branch 'master' into dev-modernize

Browse Source 
Hopefully nothing went too wrong.
This commit is contained in:
Martin Hořeňovský committed 2017-06-05 17:19:42 +02:00
2 parents b459bb4c43 3e018ef131
commit 7f6773bb4d
27 files changed
+264 -52
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/internal/catch_assertionresult.h
+2 -2
View File
@@ -33,8 +33,8 @@ namespace Catch {
template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( T const& );
template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( T const& );
private:
DecomposedExpression& operator = (DecomposedExpression const&);
private:
DecomposedExpression& operator = (DecomposedExpression const&);
};
struct AssertionInfo