Changeset d60ccbf for src/SynTree/TypeSubstitution.h

Timestamp:

Aug 12, 2015, 2:27:31 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, 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/SynTree/TypeSubstitution.h (modified) (1 diff)

src/SynTree/TypeSubstitution.h

@@ -157 +157 @@
 }
 
-// helper function
+/// Instantiate each member of the context given the actual parameters specified, and store the
+/// instantiations for use by the indexer
 template< typename FormalIterator, typename ActualIterator, typename MemberIterator, typename OutputIterator >
 void applySubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actual, MemberIterator memberBegin, MemberIterator memberEnd, OutputIterator out ) {
-        // Instantiate each member of the context given the actual parameters specified, and store the
-        // instantiations for use by the indexer
-
         TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
         for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {