Changeset fbfde843 for src/libcfa/fstream

Timestamp:

May 2, 2016, 3:15:07 PM (10 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, with_gc

Children:

d7903b1

Parents:

540de412 (diff), e945826 (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' into ctor

Conflicts:

src/libcfa/fstream.c
src/libcfa/iostream.c

File:

• src/libcfa/fstream (modified) (2 diffs)

src/libcfa/fstream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 19 20:44:10 2016
-// Update Count     : 84
+// Last Modified On : Thu Apr 28 08:08:04 2016
+// Update Count     : 88
 //
 
@@ -22 +22 @@
 struct ofstream {
         void *file;
-        int sepDefault;
-        int sepOnOff;
+        _Bool sepDefault;
+        int sepOnOff;                                                                           // FIX ME: type should be _Bool
         char separator[separateSize];
 }; // ofstream