Changeset 8135d4c for src/ResolvExpr/TypeEnvironment.cc

Timestamp:

Aug 22, 2017, 7:31:52 PM (8 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/ResolvExpr/TypeEnvironment.cc (modified) (1 diff)

src/ResolvExpr/TypeEnvironment.cc

@@ -14 +14 @@
 //
 
-#include <algorithm>
-#include <iterator>
-
+#include <cassert>                     // for assert
+#include <algorithm>                   // for copy, set_intersection
+#include <iterator>                    // for ostream_iterator, insert_iterator
+#include <utility>                     // for pair
+
+#include "Common/utility.h"            // for maybeClone
+#include "SynTree/Type.h"              // for Type, FunctionType, Type::Fora...
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 #include "TypeEnvironment.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
-#include "Common/utility.h"
 
 namespace ResolvExpr {