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/annotator_raw_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/annotator_raw_impl.cc')
| -rw-r--r-- | gr-blocks/lib/annotator_raw_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-blocks/lib/annotator_raw_impl.cc b/gr-blocks/lib/annotator_raw_impl.cc index fa323f999e..ee5deb1f6b 100644 --- a/gr-blocks/lib/annotator_raw_impl.cc +++ b/gr-blocks/lib/annotator_raw_impl.cc @@ -60,7 +60,7 @@ namespace gr { void annotator_raw_impl::add_tag(uint64_t offset, pmt_t key, pmt_t val) { - gruel::scoped_lock l(d_mutex); + gr::thread::scoped_lock l(d_mutex); gr_tag_t tag; tag.srcid = pmt::intern(name()); @@ -84,7 +84,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - gruel::scoped_lock l(d_mutex); + gr::thread::scoped_lock l(d_mutex); const char *in = (const char*)input_items[0]; char *out = (char*)output_items[0]; |