Changeset 6943a987 for src/ResolvExpr/TypeEnvironment.h

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

5e644d3e

Parents:

79841be (diff), 413ad05 (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/TypeEnvironment.h (modified) (4 diffs)

src/ResolvExpr/TypeEnvironment.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypeEnvironment.h -- 
+// TypeEnvironment.h --
 //
 // Author           : Richard C. Bilson
@@ -28 +28 @@
 
 namespace ResolvExpr {
-        typedef std::map< DeclarationWithType*, bool > AssertionSet;
+        struct AssertCompare {
+                bool operator()( DeclarationWithType * d1, DeclarationWithType * d2 );
+        };
+        typedef std::map< DeclarationWithType*, bool, AssertCompare > AssertionSet;
         typedef std::map< std::string, TypeDecl::Kind > OpenVarSet;
 
@@ -39 +42 @@
                 bool allowWidening;
                 TypeDecl::Kind kind;
-  
+
                 void initialize( const EqvClass &src, EqvClass &dest );
                 EqvClass();
@@ -62 +65 @@
                 void extractOpenVars( OpenVarSet &openVars ) const;
                 TypeEnvironment *clone() const { return new TypeEnvironment( *this ); }
-  
+
                 typedef std::list< EqvClass >::iterator iterator;
                 iterator begin() { return env.begin(); }