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-digital/lib/map_bb_impl.cc | |
parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-digital/lib/map_bb_impl.cc')
-rw-r--r-- | gr-digital/lib/map_bb_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-digital/lib/map_bb_impl.cc b/gr-digital/lib/map_bb_impl.cc index 3a06394ec4..4ea91835a9 100644 --- a/gr-digital/lib/map_bb_impl.cc +++ b/gr-digital/lib/map_bb_impl.cc @@ -51,7 +51,7 @@ namespace gr { void map_bb_impl::set_map(const std::vector<int> &map) { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); for(int i = 0; i < 0x100; i++) d_map[i] = i; @@ -75,7 +75,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock guard(d_mutex); + gr::thread::scoped_lock guard(d_mutex); const unsigned char *in = (const unsigned char*)input_items[0]; unsigned char *out = (unsigned char*)output_items[0]; |