Changeset 8135d4c for src/GenPoly/ScrubTyVars.h

Timestamp:

Aug 22, 2017, 7:31:52 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (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 references

File:

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

src/GenPoly/ScrubTyVars.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScrubTyVars.h -- 
+// ScrubTyVars.h --
 //
 // Author           : Richard C. Bilson
@@ -16 +16 @@
 #pragma once
 
-#include <string>
+#include <cassert>            // for assert
 
-#include "GenPoly.h"
+#include "GenPoly.h"          // for TyVarMap, isPolyType, isDynType
+#include "SynTree/Mutator.h"  // for Mutator
+#include "SynTree/Type.h"     // for Type (ptr only), PointerType (ptr only)
 
-#include "SynTree/SynTree.h"
-#include "SynTree/Mutator.h"
+class AlignofExpr;
+class Expression;
+class SizeofExpr;
 
 namespace GenPoly {
@@ -66 +69 @@
                         // return dynamicOnly ? isDynType( ty, tyVars ) : isPolyType( ty, tyVars );
                 }
-                
+
                 /// Mutates (possibly generic) aggregate types appropriately
                 Type* mutateAggregateType( Type *ty );
-                
+
                 const TyVarMap *tyVars;  ///< Type variables to scrub
                 ScrubMode mode;          ///< which type variables to scrub? [FromMap]