diff options
author | Josh Blum | 2013-04-03 23:58:52 -0700 |
---|---|---|
committer | Josh Blum | 2013-04-03 23:58:52 -0700 |
commit | 06b800166e995cf53ec0f87200427512e1518d8f (patch) | |
tree | cf75d446f986f0bee4976bd4d2d99ea1397cceff /lib/hier_block.cpp | |
parent | f7f459df3b1b4349138324b14703fc18bff7e2a6 (diff) | |
parent | c85fe5cb75d32544eb89a573e8df61757a940766 (diff) | |
download | sandhi-06b800166e995cf53ec0f87200427512e1518d8f.tar.gz sandhi-06b800166e995cf53ec0f87200427512e1518d8f.tar.bz2 sandhi-06b800166e995cf53ec0f87200427512e1518d8f.zip |
Merge branch 'ownership_work'
Diffstat (limited to 'lib/hier_block.cpp')
-rw-r--r-- | lib/hier_block.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/hier_block.cpp b/lib/hier_block.cpp index 4c0aef3..ab474c5 100644 --- a/lib/hier_block.cpp +++ b/lib/hier_block.cpp @@ -40,8 +40,11 @@ void HierBlock::disconnect(const Element &elem) static Apology::Wax get_ref(const Element &elem) { - boost::shared_ptr<Element> shared_self = elem.weak_self.lock(); - if (shared_self) return shared_self; + if (elem.weak_self) + { + boost::shared_ptr<void> shared_self = elem.weak_self->lock(); + if (shared_self) return shared_self; + } return elem; } |