Changeset 6ac5223 for src/ResolvExpr/CommonType.cc

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/ResolvExpr/CommonType.cc (modified) (1 diff)

src/ResolvExpr/CommonType.cc

@@ -14 +14 @@
 //
 
-#include "typeops.h"
-#include "SynTree/Type.h"
-#include "Unify.h"
+#include <cassert>                       // for safe_dynamic_cast
+#include <map>                           // for _Rb_tree_const_iterator
+#include <utility>                       // for pair
+
+#include "ResolvExpr/TypeEnvironment.h"  // for OpenVarSet, AssertionSet
+#include "SymTab/Indexer.h"              // for Indexer
+#include "SynTree/Declaration.h"         // for TypeDecl, NamedTypeDecl (ptr...
+#include "SynTree/Type.h"                // for BasicType, BasicType::Kind::...
+#include "SynTree/Visitor.h"             // for Visitor
+#include "Unify.h"                       // for unifyExact, bindVar, WidenMode
+#include "typeops.h"                     // for isFtype