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

@@ -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

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -1063,7 +1063,9 @@
           (std::numeric_limits<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"/>