revert a workaround fix to CDMap that was committed as part of the arith-indexed-vars merge, and fix the root cause (maybe?) in attribute.cpp: previously, items from the cdnodes attribute table weren't properly being "obliterated" from the table due to a typo

1 files changed, 6 insertions, 6 deletions

diff --git a/src/context/cdmap.h b/src/context/cdmap.h
index b7fc5dcc6..0b75ee284 100644
--- a/src/context/cdmap.h
+++ b/src/context/cdmap.h
@@ -344,13 +344,13 @@ public:
     emptyTrash();
     Debug("gc") << "done emptying trash for " << this << std::endl;
 
-    for(Element* i = d_first; i != NULL;) {
+    for(typename table_type::iterator i = d_map.begin();
+        i != d_map.end();
+        ++i) {
       // mark it as being a destruction (short-circuit restore())
-      Element* thisOne = i;
-      i = i->next();
-      thisOne->d_map = NULL;
-      if(!thisOne->d_noTrash) {
-        thisOne->deleteSelf();
+      (*i).second->d_map = NULL;
+      if(!(*i).second->d_noTrash) {
+        (*i).second->deleteSelf();
       }
     }
     d_map.clear();