diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-blocks/lib/delay_impl.cc | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-blocks/lib/delay_impl.cc')
| -rw-r--r-- | gr-blocks/lib/delay_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/lib/delay_impl.cc b/gr-blocks/lib/delay_impl.cc index 67449aca20..08cd1db1c3 100644 --- a/gr-blocks/lib/delay_impl.cc +++ b/gr-blocks/lib/delay_impl.cc @@ -69,7 +69,7 @@ namespace gr { // protects from quickly-repeated calls to this function that // would end with d_delta=0. if(d != dly()) { - gruel::scoped_lock l(d_mutex_delay); + gr::thread::scoped_lock l(d_mutex_delay); int old = dly(); set_history(d+1); d_delta += dly() - old; @@ -82,7 +82,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock l(d_mutex_delay); + gr::thread::scoped_lock l(d_mutex_delay); assert(input_items.size() == output_items.size()); const char *iptr; |