Changeset d60ccbf for src/CodeGen/FixNames.h

Timestamp:

Aug 12, 2015, 2:27:31 PM (9 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, string, with_gc

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/CodeGen/FixNames.h (modified) (1 diff)

src/CodeGen/FixNames.h

@@ -20 +20 @@
 
 namespace CodeGen {
+        /// mangles object and function names
         void fixNames( std::list< Declaration* > translationUnit );
 } // namespace CodeGen