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 /gnuradio-runtime/lib/gr_msg_queue.cc | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/lib/gr_msg_queue.cc')
| -rw-r--r-- | gnuradio-runtime/lib/gr_msg_queue.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnuradio-runtime/lib/gr_msg_queue.cc b/gnuradio-runtime/lib/gr_msg_queue.cc index 0cf0467715..03bbe046a4 100644 --- a/gnuradio-runtime/lib/gr_msg_queue.cc +++ b/gnuradio-runtime/lib/gr_msg_queue.cc @@ -49,7 +49,7 @@ gr_msg_queue::insert_tail(gr_message_sptr msg) if (msg->d_next) throw std::invalid_argument("gr_msg_queue::insert_tail: msg already in queue"); - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); while (full_p()) d_not_full.wait(guard); @@ -72,7 +72,7 @@ gr_msg_queue::insert_tail(gr_message_sptr msg) gr_message_sptr gr_msg_queue::delete_head() { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); gr_message_sptr m; while ((m = d_head) == 0) @@ -94,7 +94,7 @@ gr_msg_queue::delete_head() gr_message_sptr gr_msg_queue::delete_head_nowait() { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); gr_message_sptr m; if ((m = d_head) == 0){ |