diff options
| author | Thomas Habets <thomas@habets.se> | 2019-12-21 17:49:11 +0000 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2020-01-02 23:43:00 +0100 |
| commit | 8f08f986aae37c87b2dddc4ed8d0d36dbed02dd7 (patch) | |
| tree | 1e9a9983b8ad7d0d66de448216dab5c54cccbb14 | |
| parent | 9a2a421a9c54c2dd3fab29e0af9ca5446935d895 (diff) | |
gr-digital: Remove needless type trickery
| -rw-r--r-- | gr-digital/lib/constellation_receiver_cb_impl.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/symbol_sync_cc_impl.cc | 10 | ||||
| -rw-r--r-- | gr-digital/lib/symbol_sync_ff_impl.cc | 10 |
3 files changed, 6 insertions, 18 deletions
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index 7fb7559d5e..f7f4c2fc8f 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -44,10 +44,10 @@ constellation_receiver_cb::sptr constellation_receiver_cb::make( new constellation_receiver_cb_impl(constell, loop_bw, fmin, fmax)); } -static int ios[] = { +static const std::vector<int> iosig = { sizeof(char), sizeof(float), sizeof(float), sizeof(float), sizeof(gr_complex) }; -static std::vector<int> iosig(ios, ios + sizeof(ios) / sizeof(int)); + constellation_receiver_cb_impl::constellation_receiver_cb_impl( constellation_sptr constellation, float loop_bw, float fmin, float fmax) : block("constellation_receiver_cb", diff --git a/gr-digital/lib/symbol_sync_cc_impl.cc b/gr-digital/lib/symbol_sync_cc_impl.cc index 2e358bb991..8e90285abd 100644 --- a/gr-digital/lib/symbol_sync_cc_impl.cc +++ b/gr-digital/lib/symbol_sync_cc_impl.cc @@ -86,15 +86,9 @@ symbol_sync_cc_impl::symbol_sync_cc_impl(enum ted_type detector_type, d_out_instantaneous_clock_period(NULL), d_out_average_clock_period(NULL) { - // Brute force fix of the output io_signature, because I can't get - // an anonymous std::vector<int>() rvalue, with a const expression - // initializing the vector, to work. Lvalues seem to make everything - // better. - int output_io_sizes[4] = { + set_output_signature(io_signature::makev(1, 4, { sizeof(gr_complex), sizeof(float), sizeof(float), sizeof(float) - }; - std::vector<int> output_io_sizes_vector(&output_io_sizes[0], &output_io_sizes[4]); - set_output_signature(io_signature::makev(1, 4, output_io_sizes_vector)); + })); if (sps <= 1.0f) throw std::out_of_range("nominal samples per symbol must be > 1"); diff --git a/gr-digital/lib/symbol_sync_ff_impl.cc b/gr-digital/lib/symbol_sync_ff_impl.cc index d3a61d486b..9b8fd07215 100644 --- a/gr-digital/lib/symbol_sync_ff_impl.cc +++ b/gr-digital/lib/symbol_sync_ff_impl.cc @@ -88,15 +88,9 @@ symbol_sync_ff_impl::symbol_sync_ff_impl(enum ted_type detector_type, d_out_instantaneous_clock_period(NULL), d_out_average_clock_period(NULL) { - // Brute force fix of the output io_signature, because I can't get - // an anonymous std::vector<int>() rvalue, with a const expression - // initializing the vector, to work. Lvalues seem to make everything - // better. - int output_io_sizes[4] = { + set_output_signature(io_signature::makev(1, 4, { sizeof(float), sizeof(float), sizeof(float), sizeof(float) - }; - std::vector<int> output_io_sizes_vector(&output_io_sizes[0], &output_io_sizes[4]); - set_output_signature(io_signature::makev(1, 4, output_io_sizes_vector)); + })); if (sps <= 1.0f) throw std::out_of_range("nominal samples per symbol must be > 1"); |