approvals rebase

- I *think* this fixes an earlier regression, but I'm not 100% sure where that came from!
This commit is contained in:
Phil Nash 2015-07-28 18:24:20 +01:00
parent f3308ed7c4
commit 0edebf41b0
2 changed files with 12 additions and 4 deletions

View File

@ -846,7 +846,9 @@ ConditionTests.cpp:<line number>:
PASSED: PASSED:
REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul ) REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
with expansion: with expansion:
4294967295 (0x<hex digits>) > 4 18446744073709551615 (0x<hex digits>)
>
4
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
comparisons between int variables comparisons between int variables
@ -6286,7 +6288,9 @@ TrickyTests.cpp:<line number>:
PASSED: PASSED:
CHECK( m == &S::f ) CHECK( m == &S::f )
with expansion: with expansion:
0x<hex digits> == 0x<hex digits> 0x<hex digits>
==
0x<hex digits>
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
pointer to class pointer to class

View File

@ -1063,7 +1063,9 @@
(std::numeric_limits&lt;unsigned long>::max)() > ul (std::numeric_limits&lt;unsigned long>::max)() > ul
</Original> </Original>
<Expanded> <Expanded>
4294967295 (0x<hex digits>) > 4 18446744073709551615 (0x<hex digits>)
>
4
</Expanded> </Expanded>
</Expression> </Expression>
<OverallResult success="true"/> <OverallResult success="true"/>
@ -6460,7 +6462,9 @@ there"
m == &amp;S::f m == &amp;S::f
</Original> </Original>
<Expanded> <Expanded>
0x<hex digits> == 0x<hex digits> 0x<hex digits>
==
0x<hex digits>
</Expanded> </Expanded>
</Expression> </Expression>
<OverallResult success="true"/> <OverallResult success="true"/>