Changeset bc934cdf for src/CodeGen/LineStream.cc

Timestamp:

May 9, 2017, 2:25:04 PM (8 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:

903f7c3

Parents:

6182039 (diff), 4810867 (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/CodeGen/LineStream.cc (modified) (4 diffs)

src/CodeGen/LineStream.cc

@@ -10 +10 @@
 // Created On       : Thr May 4 13:15:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 14:29:00 2017
+// Last Modified On : Mon May 8 12:08:00 2017
 // Update Count     : 0
 //
@@ -17 +17 @@
 
 namespace CodeGen {
-
-        LineStream::LineStream(std::ostream & baseStream, bool insertLines) :
-                baseStream(baseStream), insertLines(insertLines)
-        {}
 
         void LineStream::printLineDirective(CodeLocation const & location) {
@@ -44 +40 @@
                 actualLocation.unset();
 
-                if (addNewLine) {
+                if (addNewline) {
                         expectedLocation.linenumber += 1;
                         buffer.put('\n');
@@ -79 +75 @@
 
         LineStream & LineStream::operator<<(StreamFlag flag) {
-                static StringFlag const endlCopy = std::endl;
+                static StreamFlag const endlCopy = std::endl;
                 if (!insertLines) {
                         baseStream << flag;