Changeset 8135d4c for src/ResolvExpr/TypeEnvironment.h

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.h (modified) (1 diff)

src/ResolvExpr/TypeEnvironment.h

@@ -16 +16 @@
 #pragma once
 
-#include <string>
-#include <set>
-#include <list>
-#include <iostream>
+#include <iostream>                    // for ostream
+#include <list>                        // for list, list<>::iterator, list<>...
+#include <map>                         // for map, map<>::value_compare
+#include <set>                         // for set
+#include <string>                      // for string
 
-#include "SynTree/SynTree.h"
-#include "SynTree/Type.h"
-#include "SynTree/TypeSubstitution.h"
-#include "SynTree/Declaration.h"
+#include "SynTree/Declaration.h"       // for TypeDecl::Data, DeclarationWit...
+#include "SynTree/SynTree.h"           // for UniqueId
+#include "SynTree/Type.h"              // for Type, Type::ForallList
+#include "SynTree/TypeSubstitution.h"  // for TypeSubstitution
 
 namespace ResolvExpr {