Changes in src/ResolvExpr/Unify.h [6b0b624:a2a77af]

File:

• src/ResolvExpr/Unify.h (modified) (3 diffs)

src/ResolvExpr/Unify.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Unify.h --
+// Unify.h -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 13:09:04 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 23:09:34 2017
-// Update Count     : 3
+// Last Modified On : Sun May 17 13:10:34 2015
+// Update Count     : 2
 //
 
-#pragma once
+#ifndef UNIFY_H
+#define UNIFY_H
 
 #include <map>
@@ -36 +37 @@
                 bool widenFirst : 1, widenSecond : 1;
         };
-
-        bool bindVar( TypeInstType *typeInst, Type *other, const TypeDecl::Data & data, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
+        
+        bool bindVar( TypeInstType *typeInst, Type *other, TypeDecl::Kind kind, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer );
         bool unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer, Type *&commonType );
@@ -71 +72 @@
 } // namespace ResolvExpr
 
+#endif // UNIFY_H
+
 // Local Variables: //
 // tab-width: 4 //