Changeset 734014e for src/ResolvExpr/TypeEnvironment.h

Timestamp:

May 1, 2019, 2:04:52 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5157ba7

Parents:

1b3eef8 (diff), 3908e5d (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) (3 diffs)

src/ResolvExpr/TypeEnvironment.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:24:58 2015
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Mon Jun 18 11:58:00 2018
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr 30 23:04:10 2019
+// Update Count     : 9
 //
 
@@ -18 +18 @@
 #include <iostream>                    // for ostream
 #include <list>                        // for list, list<>::iterator, list<>...
-#include <map>                         // for map, map<>::value_compare
-#include <set>                         // for set
+#include <map>                                             // for map, map<>::value_compare
+#include <unordered_map>
+#include <set>                                             // for set
 #include <string>                      // for string
 #include <utility>                     // for move, swap
@@ -64 +65 @@
                 AssertionSetValue() : isUsed(false), resnSlot(0) {}
         };
-        typedef std::map< DeclarationWithType*, AssertionSetValue, AssertCompare > AssertionSet;
-        typedef std::map< std::string, TypeDecl::Data > OpenVarSet;
+        typedef std::map< DeclarationWithType *, AssertionSetValue, AssertCompare > AssertionSet;
+        typedef std::unordered_map< std::string, TypeDecl::Data > OpenVarSet;
 
         /// merges one set of open vars into another