diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-21 19:53:16 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-21 19:53:16 -0700 |
| commit | b43c396c9cc2733041a1433f287735a2df48be82 (patch) | |
| tree | 733a1778435a22ac4b14f4522e995dc539860a85 | |
| parent | fdfece16643f4f997cdbbd14a8646ae5f417e258 (diff) | |
| parent | e61a5c86d005af6fc91281e9fb43c374272c14cd (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gnuradio-runtime/lib/pmt/unv_template.cc.t | 3 | ||||
| -rw-r--r-- | gr-blocks/lib/message_strobe_impl.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gnuradio-runtime/lib/pmt/unv_template.cc.t b/gnuradio-runtime/lib/pmt/unv_template.cc.t index d3fa14bee1..c9402de19d 100644 --- a/gnuradio-runtime/lib/pmt/unv_template.cc.t +++ b/gnuradio-runtime/lib/pmt/unv_template.cc.t @@ -21,8 +21,7 @@ pmt_@TAG@vector::pmt_@TAG@vector(size_t k, @TYPE@ fill) pmt_@TAG@vector::pmt_@TAG@vector(size_t k, const @TYPE@ *data) : d_v(k) { - for (size_t i = 0; i < k; i++) - d_v[i] = data[i]; + memcpy( &d_v[0], data, k * sizeof(@TYPE@) ); } @TYPE@ diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index ae13808674..d12e0ebd4d 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -67,6 +67,9 @@ namespace gr { bool message_strobe_impl::start() { + // NOTE: d_finished should be something explicitely thread safe. But since + // nothing breaks on concurrent access, I'll just leave it as bool. + d_finished = false; d_thread = boost::shared_ptr<gr::thread::thread> (new gr::thread::thread(boost::bind(&message_strobe_impl::run, this))); |