From 0edebf41b03e50db985d8b1a029595898b327941 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Tue, 28 Jul 2015 18:24:20 +0100
Subject: [PATCH] approvals rebase - I *think* this fixes an earlier
 regression, but I'm not 100% sure where that came from!

---
 projects/SelfTest/Baselines/console.sw.approved.txt | 8 ++++++--
 projects/SelfTest/Baselines/xml.sw.approved.txt     | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 675edc2f..2e81da7b 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -846,7 +846,9 @@ ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
 with expansion:
-  4294967295 (0x<hex digits>) > 4
+  18446744073709551615 (0x<hex digits>)
+  >
+  4
 
 -------------------------------------------------------------------------------
 comparisons between int variables
@@ -6286,7 +6288,9 @@ TrickyTests.cpp:<line number>:
 PASSED:
   CHECK( m == &S::f )
 with expansion:
-  0x<hex digits> == 0x<hex digits>
+  0x<hex digits>
+  ==
+  0x<hex digits>
 
 -------------------------------------------------------------------------------
 pointer to class
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 07f7843d..9740926f 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -1063,7 +1063,9 @@
           (std::numeric_limits&lt;unsigned long>::max)() > ul
         </Original>
         <Expanded>
-          4294967295 (0x<hex digits>) > 4
+          18446744073709551615 (0x<hex digits>)
+>
+4
         </Expanded>
       </Expression>
       <OverallResult success="true"/>
@@ -6460,7 +6462,9 @@ there"
           m == &amp;S::f
         </Original>
         <Expanded>
-          0x<hex digits> == 0x<hex digits>
+          0x<hex digits>
+==
+0x<hex digits>
         </Expanded>
       </Expression>
       <OverallResult success="true"/>