From fa56c39802a82e6e0e730813a57e86e1aea09a24 Mon Sep 17 00:00:00 2001
From: Eric Blossom <eb@comsec.com>
Date: Tue, 3 Aug 2010 11:54:25 -0700
Subject: fix scoped_lock that didn't ref mutex
---
gnuradio-core/src/lib/runtime/gr_sptr_magic.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
index 96ffae85fe..b0351248c3 100644
--- a/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
+++ b/gnuradio-core/src/lib/runtime/gr_sptr_magic.cc
@@ -39,7 +39,7 @@ namespace gnuradio {
detail::sptr_magic::create_and_stash_initial_sptr(gr_hier_block2 *p)
{
gr_basic_block_sptr sptr(p);
- gruel::scoped_lock guard();
+ gruel::scoped_lock guard(s_mutex);
s_map.insert(sptr_map::value_type(static_cast<gr_basic_block *>(p), sptr));
}
@@ -60,7 +60,7 @@ namespace gnuradio {
* p is a subclass of gr_hier_block2, thus we've already created the shared pointer
* and stashed it away. Fish it out and return it.
*/
- gruel::scoped_lock guard();
+ gruel::scoped_lock guard(s_mutex);
sptr_map::iterator pos = s_map.find(static_cast<gr_basic_block *>(p));
if (pos == s_map.end())
throw std::invalid_argument("gr_sptr_magic: invalid pointer!");
--
cgit v1.2.3