Changeset f7f997a for src/ResolvExpr/Unify.h

Timestamp:

Nov 17, 2023, 3:23:48 PM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

decd4a6

Parents:

16e0dcb (diff), 2908f08 (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/Unify.h (modified) (2 diffs)

src/ResolvExpr/Unify.h

@@ -15 +15 @@
 
 #pragma once
-
-#include <list>                   // for list
 
 #include "AST/Node.hpp"             // for ptr
@@ -47 +45 @@
         const ast::ptr<ast::Type> & type1, const ast::ptr<ast::Type> & type2,
         ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
-        const ast::OpenVarSet & open, WidenMode widen, 
+        const ast::OpenVarSet & open, WidenMode widen,
         ast::ptr<ast::Type> & common );
 
 bool typesCompatible(
-        const ast::Type *, const ast::Type *, 
+        const ast::Type *, const ast::Type *,
         const ast::TypeEnvironment & env = {} );