diff options
| author | Josh Blum | 2013-03-17 23:12:31 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-03-17 23:12:31 -0700 |
| commit | bfefd11011987fe9755dd72d86ad4f052b3d263e (patch) | |
| tree | 73b3960d46caed9996dfeff4856c3bcc546c9006 /gr-filter | |
| parent | cb5ff01c491d4558a096fc1649b85283c36ccf91 (diff) | |
| parent | 3693ee3259fa8bf2d9ad393842a80cd1fc330863 (diff) | |
| download | gnuradio-bfefd11011987fe9755dd72d86ad4f052b3d263e.tar.gz gnuradio-bfefd11011987fe9755dd72d86ad4f052b3d263e.tar.bz2 gnuradio-bfefd11011987fe9755dd72d86ad4f052b3d263e.zip | |
Merge branch 'maint' of https://github.com/guruofquality/gnuradio into v3.6.4git_gras_support
Conflicts:
gnuradio-core/src/lib/runtime/gr_block.cc
gnuradio-core/src/lib/runtime/gr_block.h
gnuradio-core/src/lib/runtime/gr_types.h
Diffstat (limited to 'gr-filter')
| -rw-r--r-- | gr-filter/lib/fir_filter_XXX_impl.cc.t | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-filter/lib/fir_filter_XXX_impl.cc.t b/gr-filter/lib/fir_filter_XXX_impl.cc.t index 529c51e2b..319c26727 100644 --- a/gr-filter/lib/fir_filter_XXX_impl.cc.t +++ b/gr-filter/lib/fir_filter_XXX_impl.cc.t @@ -64,6 +64,7 @@ namespace gr { void @IMPL_NAME@::set_taps(const std::vector<@TAP_TYPE@> &taps) { + gruel::scoped_lock l(d_setlock); d_fir->set_taps(taps); d_updated = true; } @@ -79,6 +80,8 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { + gruel::scoped_lock l(d_setlock); + const @I_TYPE@ *in = (const @I_TYPE@*)input_items[0]; @O_TYPE@ *out = (@O_TYPE@*)output_items[0]; |