Changeset d1b9d78 for src/libcfa

Timestamp:

Jul 13, 2016, 1:44:00 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

9c791dd

Parents:

8884112 (diff), ed9ecda (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:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• iostream (modified) (3 diffs)
• iostream.c (modified) (2 diffs)

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 10 23:00:12 2016
-// Update Count     : 92
+// Last Modified On : Tue Jul 12 18:01:09 2016
+// Update Count     : 93
 //
 
@@ -42 +42 @@
 };
 
-// implement writable for some intrinsic types
+// implement writable for intrinsic types
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char );
@@ -67 +67 @@
 
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
+// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 26 10:08:31 2016
-// Update Count     : 305
+// Last Modified On : Tue Jul 12 18:01:39 2016
+// Update Count     : 306
 //
 
@@ -185 +185 @@
 
 forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, ostype * (* manip)( ostype * ) ) {
+ostype * ?|?( ostype * os, ostype * (* manip)( ostype * ) ) {
         return manip( os );
 } // ?|?