Changeset 937e51d for src/ControlStruct/LabelGenerator.cc

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:

• src/ControlStruct/LabelGenerator.cc (modified) (2 diffs)

src/ControlStruct/LabelGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 15:32:04 2015
-// Update Count     : 2
+// Last Modified On : Tue Jun 23 12:18:34 2015
+// Update Count     : 13
 //
 
 #include <iostream>
-#include <strstream>
+#include <sstream>
 
 #include "LabelGenerator.h"
@@ -29 +29 @@
         }
 
-        Label LabelGenerator::newLabel() {
-                std::ostrstream os;
-                os << "__L" << current++ << "__";// << std::ends;
-                os.freeze( false );
-                std::string ret = std::string (os.str(), os.pcount());
+        Label LabelGenerator::newLabel( std::string suffix ) {
+                std::ostringstream os;
+                os << "__L" << current++ << "__" << suffix;
+                std::string ret = os.str();
                 return Label( ret );
         }