diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-09-21 22:40:50 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-09-21 22:40:50 +0000 |
| commit | 818d7fc74583965e87c35360c2fed890844efbba (patch) | |
| tree | 07d282fbc4f5e1641f4faa82f47bb9e5b1cc25c6 /src/expr/node_manager.cpp | |
| parent | 2b2d9092eea1f50b468e459029dcfdd88e2232da (diff) | |
remove assertion in TNode destructor and ensure all TNode methods check rc > 0 (resolves bug #200); on NodeManager/ExprManager side, no more prepareToBeDestroyed() / inDestruction
Diffstat (limited to 'src/expr/node_manager.cpp')
| -rw-r--r-- | src/expr/node_manager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp index b7bbe2ff8..1f15f7e29 100644 --- a/src/expr/node_manager.cpp +++ b/src/expr/node_manager.cpp @@ -84,8 +84,7 @@ struct NVReclaim { NodeManager::NodeManager(context::Context* ctxt) : d_attrManager(ctxt), d_nodeUnderDeletion(NULL), - d_inReclaimZombies(false), - d_inDestruction(false) { + d_inReclaimZombies(false) { poolInsert( &expr::NodeValue::s_null ); for(unsigned i = 0; i < unsigned(kind::LAST_KIND); ++i) { @@ -102,7 +101,6 @@ NodeManager::~NodeManager() { // destruction of operators, because they get GCed. NodeManagerScope nms(this); - d_inDestruction = true; { ScopedBool dontGC(d_inReclaimZombies); |