diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-10-02 23:53:18 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-10-02 23:53:18 +0000 |
commit | 036a23f59bbc23343dc690fd1e147541e79e9b9e (patch) | |
tree | 697cac1b21e1826b7798b69dce7f4480a26e8f77 /src/expr/attribute.cpp | |
parent | 999b496fbf50525b7245ee28e972d7f0f04a1025 (diff) |
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
Diffstat (limited to 'src/expr/attribute.cpp')
-rw-r--r-- | src/expr/attribute.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/expr/attribute.cpp b/src/expr/attribute.cpp index 5aaa7393a..295244473 100644 --- a/src/expr/attribute.cpp +++ b/src/expr/attribute.cpp @@ -38,24 +38,12 @@ void AttributeManager::deleteAllAttributes(NodeValue* nv) { deleteFromTable(d_ptrs, nv); // FIXME CD-bools in optimized table - for(unsigned id = 0; id < attr::LastAttributeId<bool, true>::s_id; ++id) { - d_cdbools.obliterate(std::make_pair(id, nv)); - } - for(unsigned id = 0; id < attr::LastAttributeId<uint64_t, true>::s_id; ++id) { - d_cdints.obliterate(std::make_pair(id, nv)); - } - for(unsigned id = 0; id < attr::LastAttributeId<TNode, true>::s_id; ++id) { - d_cdtnodes.obliterate(std::make_pair(id, nv)); - } - for(unsigned id = 0; id < attr::LastAttributeId<TNode, true>::s_id; ++id) { - d_cdnodes.obliterate(std::make_pair(id, nv)); - } - for(unsigned id = 0; id < attr::LastAttributeId<std::string, true>::s_id; ++id) { - d_cdstrings.obliterate(std::make_pair(id, nv)); - } - for(unsigned id = 0; id < attr::LastAttributeId<void*, true>::s_id; ++id) { - d_cdptrs.obliterate(std::make_pair(id, nv)); - } + deleteFromTable(d_cdbools, nv); + deleteFromTable(d_cdints, nv); + deleteFromTable(d_cdtnodes, nv); + deleteFromTable(d_cdnodes, nv); + deleteFromTable(d_cdstrings, nv); + deleteFromTable(d_cdptrs, nv); } void AttributeManager::deleteAllAttributes() { |