Changeset 937e51d for src/SymTab/Mangler.cc

Timestamp:

Jun 26, 2015, 4:00:26 PM (11 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/SymTab/Mangler.cc (modified) (4 diffs)

src/SymTab/Mangler.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:40:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:50:47 2015
-// Update Count     : 3
+// Last Modified On : Mon Jun  8 15:12:12 2015
+// Update Count     : 8
 //
 
@@ -160 +160 @@
                 } else {
                         printQualifiers( typeInst );
-                        std::ostrstream numStream;
+                        std::ostringstream numStream;
                         numStream << varNum->second.first;
-                        mangleName << (numStream.pcount() + 1);
                         switch ( (TypeDecl::Kind )varNum->second.second ) {
                           case TypeDecl::Any:
@@ -174 +173 @@
                                 break;
                         } // switch
-                        mangleName << std::string( numStream.str(), numStream.pcount() );
+                        mangleName << numStream.str();
                 } // if
         }
@@ -220 +219 @@
                                         sub_mangler.varNums = varNums;
                                         (*assert)->accept( sub_mangler );
-                                        assertionNames.push_back( std::string( sub_mangler.mangleName.str(), sub_mangler.mangleName.pcount() ) );
+                                        assertionNames.push_back( sub_mangler.mangleName.str() );
                                 } // for
                         } // for