diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-blocks/lib/message_debug_impl.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/message_debug_impl.cc')
| -rw-r--r-- | gr-blocks/lib/message_debug_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc index 6455513d76..04f31f88a2 100644 --- a/gr-blocks/lib/message_debug_impl.cc +++ b/gr-blocks/lib/message_debug_impl.cc @@ -50,7 +50,7 @@ namespace gr { void message_debug_impl::store(pmt::pmt_t msg) { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); d_messages.push_back(msg); } @@ -87,7 +87,7 @@ namespace gr { pmt::pmt_t message_debug_impl::get_message(int i) { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); if((size_t)i >= d_messages.size()) { throw std::runtime_error("message_debug: index for message out of bounds.\n"); |