Changes in / [17b6fc9:506d4f0]

File:

• src/GenPoly/InstantiateGeneric.cc (modified) (2 diffs)

src/GenPoly/InstantiateGeneric.cc

@@ -172 +172 @@
                 InstantiationMap< AggregateDecl, AggregateDecl > instantiations;
                 /// Set of types which are dtype-only generic (and therefore have static layout)
-                std::set<AggregateDecl *> dtypeStatics;
+                ScopedSet< AggregateDecl* > dtypeStatics;
                 /// Namer for concrete types
                 UniqueName typeNamer;
@@ -505 +505 @@
         void GenericInstantiator::beginScope() {
                 instantiations.beginScope();
+                dtypeStatics.beginScope();
         }
 
         void GenericInstantiator::endScope() {
                 instantiations.endScope();
+                dtypeStatics.endScope();
         }