Merge r11462:11485 from jcorgan/omni into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / runtime / gr_block_executor.cc

diff --git a/gnuradio-core/src/lib/runtime/gr_block_executor.cc b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
index fd3a916d4a03e954e9316b0668c3189a2550f007..e8d30b9632a3417efaeca9f5655fe32702f60d86 100644 (file)
--- a/gnuradio-core/src/lib/runtime/gr_block_executor.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_executor.cc
@@ -68,7 +68,7 @@ min_available_space (gr_block_detail *d, int output_multiple)
   int  min_space = std::numeric_limits<int>::max();
 
   for (int i = 0; i < d->noutputs (); i++){
-    gr_buffer::scoped_lock guard(*d->output(i)->mutex());
+    gruel::scoped_lock guard(*d->output(i)->mutex());
 #if 0
     int n = round_down(d->output(i)->space_available(), output_multiple);
 #else
@@ -163,7 +163,7 @@ gr_block_executor::run_one_iteration()
        /*
         * Acquire the mutex and grab local copies of items_available and done.
         */
-       gr_buffer::scoped_lock guard(*d->input(i)->mutex());
+       gruel::scoped_lock guard(*d->input(i)->mutex());
        d_ninput_items[i] = d->input(i)->items_available();
        d_input_done[i] = d->input(i)->done();
       }
@@ -205,7 +205,7 @@ gr_block_executor::run_one_iteration()
        /*
         * Acquire the mutex and grab local copies of items_available and done.
         */
-       gr_buffer::scoped_lock guard(*d->input(i)->mutex());
+       gruel::scoped_lock guard(*d->input(i)->mutex());
        d_ninput_items[i] = d->input(i)->items_available ();
        d_input_done[i] = d->input(i)->done();
       }