Changeset ae63a18 for src/GenPoly/ScrubTyVars.h

Timestamp:

Dec 18, 2015, 2:56:11 PM (8 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:

8762501

Parents:

baf7fee (diff), c23f807 (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:

resolving conflicts

File:

• src/GenPoly/ScrubTyVars.h (modified) (2 diffs)

src/GenPoly/ScrubTyVars.h

@@ -16 +16 @@
 #ifndef _SCRUBTYVARS_H
 #define _SCRUBTYVARS_H
+
+#include <string>
 
 #include "GenPoly.h"
@@ -36 +38 @@
                 virtual Type* mutate( TypeInstType *typeInst );
                 Expression* mutate( SizeofExpr *szeof );
+                Expression* mutate( AlignofExpr *algnof );
                 virtual Type* mutate( PointerType *pointer );
           private: