Changeset ae63a18 for src/examples/sum.c

Timestamp:

Dec 18, 2015, 2:56:11 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

8762501

Parents:

baf7fee (diff), c23f807 (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:

resolving conflicts

File:

• src/examples/sum.c (modified) (5 diffs)

src/examples/sum.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 28 15:09:55 2015
-// Update Count     : 118
+// Last Modified On : Sat Nov 21 18:08:18 2015
+// Update Count     : 119
 //
 
@@ -53 +53 @@
         }
         sout << "sum from " << low << " to " << High << " is "
-                 << (int)sum( size, a ) << ", check " << (int)s << "\n";
+                 << (int)sum( size, a ) << ", check " << (int)s << endl;
 
         int s = 0, a[size];
@@ -62 +62 @@
         }
         sout << "sum from " << low << " to " << High << " is "
-                 << sum( size, (int *)a ) << ", check " << (int)s << "\n";
+                 << sum( size, (int *)a ) << ", check " << (int)s << endl;
 
         double s = 0.0, a[size];
@@ -72 +72 @@
         printf( "%g\n", sum( size, (double *)a ) );
 //      sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//               << sum( size, (double *)a ) << ", check " << (double)s << "\n";
+//               << sum( size, (double *)a ) << ", check " << (double)s << endl;
 
         float s = 0.0, a[size];
@@ -82 +82 @@
         printf( "%g\n", sum( size, (float *)a ) );
 //      sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//               << sum( size, (float *)a ) << ", check " << (float)s << "\n";
+//               << sum( size, (float *)a ) << ", check " << (float)s << endl;
 }