diff options
| author | Thomas Habets <thomas@habets.se> | 2019-12-21 17:48:10 +0000 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-01-02 23:43:00 +0100 |
| commit | 63be774868b8de73ccc20b8151a30ad88ea971cb (patch) | |
| tree | c7e7e942476754b52643d7e4b3642d23678b697f /gr-blocks/lib | |
| parent | 0e9bdd3f496e37bbdb36750e3157a43c0446b224 (diff) | |
gr-blocks/pack&unpack: Remove needless memory management
Diffstat (limited to 'gr-blocks/lib')
| -rw-r--r-- | gr-blocks/lib/pack_k_bits_bb_impl.cc | 8 | ||||
| -rw-r--r-- | gr-blocks/lib/pack_k_bits_bb_impl.h | 3 | ||||
| -rw-r--r-- | gr-blocks/lib/unpack_k_bits_bb_impl.cc | 8 | ||||
| -rw-r--r-- | gr-blocks/lib/unpack_k_bits_bb_impl.h | 3 |
4 files changed, 8 insertions, 14 deletions
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.cc b/gr-blocks/lib/pack_k_bits_bb_impl.cc index 04fbd236d9..7757e62d34 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/pack_k_bits_bb_impl.cc @@ -41,13 +41,11 @@ pack_k_bits_bb_impl::pack_k_bits_bb_impl(unsigned k) : sync_decimator("pack_k_bits_bb", io_signature::make(1, 1, sizeof(unsigned char)), io_signature::make(1, 1, sizeof(unsigned char)), - k) + k), + d_pack(k) { - d_pack = new kernel::pack_k_bits(k); } -pack_k_bits_bb_impl::~pack_k_bits_bb_impl() { delete d_pack; } - int pack_k_bits_bb_impl::work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) @@ -55,7 +53,7 @@ int pack_k_bits_bb_impl::work(int noutput_items, const unsigned char* in = (const unsigned char*)input_items[0]; unsigned char* out = (unsigned char*)output_items[0]; - d_pack->pack(out, in, noutput_items); + d_pack.pack(out, in, noutput_items); return noutput_items; } diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h index 6c9d0a0f1e..6223f67457 100644 --- a/gr-blocks/lib/pack_k_bits_bb_impl.h +++ b/gr-blocks/lib/pack_k_bits_bb_impl.h @@ -32,11 +32,10 @@ namespace blocks { class pack_k_bits_bb_impl : public pack_k_bits_bb { private: - kernel::pack_k_bits* d_pack; + const kernel::pack_k_bits d_pack; public: pack_k_bits_bb_impl(unsigned k); - ~pack_k_bits_bb_impl(); int work(int noutput_items, gr_vector_const_void_star& input_items, diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.cc b/gr-blocks/lib/unpack_k_bits_bb_impl.cc index c5824cf2d2..b81d4a8fa5 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.cc +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.cc @@ -41,13 +41,11 @@ unpack_k_bits_bb_impl::unpack_k_bits_bb_impl(unsigned k) : sync_interpolator("unpack_k_bits_bb", io_signature::make(1, 1, sizeof(unsigned char)), io_signature::make(1, 1, sizeof(unsigned char)), - k) + k), + d_unpack(k) { - d_unpack = new kernel::unpack_k_bits(k); } -unpack_k_bits_bb_impl::~unpack_k_bits_bb_impl() { delete d_unpack; } - int unpack_k_bits_bb_impl::work(int noutput_items, gr_vector_const_void_star& input_items, gr_vector_void_star& output_items) @@ -55,7 +53,7 @@ int unpack_k_bits_bb_impl::work(int noutput_items, const unsigned char* in = (const unsigned char*)input_items[0]; unsigned char* out = (unsigned char*)output_items[0]; - d_unpack->unpack(out, in, noutput_items / d_unpack->k()); + d_unpack.unpack(out, in, noutput_items / d_unpack.k()); return noutput_items; } diff --git a/gr-blocks/lib/unpack_k_bits_bb_impl.h b/gr-blocks/lib/unpack_k_bits_bb_impl.h index 0edbd18614..38cff69375 100644 --- a/gr-blocks/lib/unpack_k_bits_bb_impl.h +++ b/gr-blocks/lib/unpack_k_bits_bb_impl.h @@ -32,11 +32,10 @@ namespace blocks { class unpack_k_bits_bb_impl : public unpack_k_bits_bb { private: - kernel::unpack_k_bits* d_unpack; + const kernel::unpack_k_bits d_unpack; public: unpack_k_bits_bb_impl(unsigned k); - ~unpack_k_bits_bb_impl(); int work(int noutput_items, gr_vector_const_void_star& input_items, |