Changeset a1f7064 for src/tests/swap.c

Timestamp:

Aug 24, 2017, 7:48:35 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3c09d47

Parents:

f1bcd004 (diff), 7ece922 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/tests/swap.c (modified) (3 diffs)

src/tests/swap.c

@@ -7 +7 @@
 // swap.c -- 
 //
-// Author           : Richard C. Bilson
+// Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 21 08:10:41 2016
-// Update Count     : 69
+// Last Modified On : Wed Aug 23 20:34:45 2017
+// Update Count     : 70
 //
 
@@ -20 +20 @@
         char c1 = 'a', c2 = 'b';
         sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap ";
-        swap( &c1, &c2 );
+        swap( c1, c2 );
         sout | '\t' | c1 | ' ' | c2 | endl;
 
         signed int i1 = -1, i2 = -2;
         sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap ";
-        swap( &i1, &i2 );
+        swap( i1, i2 );
         sout | '\t' | i1 | i2 | endl;
 
         unsigned int ui1 = 1, ui2 = 2;
         sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap ";
-        swap( &ui1, &ui2 );
+        swap( ui1, ui2 );
         sout | '\t' | ui1 | ui2 | endl;
 
         signed long int li1 = -1, li2 = -2;
         sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap ";
-        swap( &li1, &li2 );
+        swap( li1, li2 );
         sout | '\t' | li1 | li2 | endl;
 
         unsigned long int uli1 = 1, uli2 = 2;
         sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap ";
-        swap( &uli1, &uli2 );
+        swap( uli1, uli2 );
         sout | '\t' | uli1 | uli2 | endl;
 
         signed long long int lli1 = -1, lli2 = -2;
         sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap ";
-        swap( &lli1, &lli2 );
+        swap( lli1, lli2 );
         sout | '\t' | lli1 | lli2 | endl;
 
         unsigned long long int ulli1 = 1, ulli2 = 2;
         sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap ";
-        swap( &ulli1, &ulli2 );
+        swap( ulli1, ulli2 );
         sout | '\t' | ulli1 | ulli2 | endl;
 
         float f1 = 1.5, f2 = 2.5;
         sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap ";
-        swap( &f1, &f2 );
+        swap( f1, f2 );
         sout | '\t' | f1 | f2 | endl;
 
         double d1 = 1.5, d2 = 2.5;
         sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap ";
-        swap( &d1, &d2 );
+        swap( d1, d2 );
         sout | '\t' | d1 | d2 | endl;
 
         long double ld1 = 1.5, ld2 = 2.5;
         sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap ";
-        swap( &ld1, &ld2 );
+        swap( ld1, ld2 );
         sout | '\t' | ld1 | ld2 | endl;
 
         float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if;
         sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap ";
-        swap( &fc1, &fc2 );
+        swap( fc1, fc2 );
         sout | '\t' | fc1 | fc2 | endl;
 
         double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id;
         sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap ";
-        swap( &dc1, &dc2 );
+        swap( dc1, dc2 );
         sout | '\t' | dc1 | dc2 | endl;
 
         long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il;
         sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap ";
-        swap( &ldc1, &ldc2 );
+        swap( ldc1, ldc2 );
         sout | '\t' | ldc1 | ldc2 | endl;
 
@@ -86 +86 @@
         ofstream * ?|?( ofstream * os, S s ) { return os | s.i | s.j; }
         sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap ";
-        swap( &s1, &s2 );
+        swap( s1, s2 );
         sout | '\t' | s1 | "," | s2 | endl;
 } // main