diff options
| author | Thomas Habets <thomas@habets.se> | 2020-03-20 12:19:33 +0000 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-03-20 09:45:50 -0400 |
| commit | d09576b9107b086f70edb4a96fbbc8bc11f82fbc (patch) | |
| tree | 970dd9b358a5d43bc5cc132b2141cc0e9e9036b1 | |
| parent | 3b43d1264b448dbff6b46942f4d107c735c3ceb5 (diff) | |
Change assert to static_assert, where possible
These are all ones I could find, so assert->static_assert should now
be done.
| -rw-r--r-- | gr-audio/lib/jack/jack_source.cc | 3 | ||||
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gr-audio/lib/jack/jack_source.cc b/gr-audio/lib/jack/jack_source.cc index fe753058b5..6f6aec9c25 100644 --- a/gr-audio/lib/jack/jack_source.cc +++ b/gr-audio/lib/jack/jack_source.cc @@ -18,6 +18,7 @@ #include <gnuradio/io_signature.h> #include <gnuradio/prefs.h> #include <stdio.h> +#include <type_traits> #include <iostream> #include <stdexcept> @@ -126,7 +127,7 @@ jack_source::jack_source(int sampling_rate, set_output_multiple(d_jack_buffer_size); - assert(sizeof(float) == sizeof(sample_t)); + static_assert(std::is_same<float, sample_t>::value, "sample_t must be float"); set_output_signature(io_signature::make(1, MAX_PORTS, sizeof(sample_t))); jack_nframes_t sample_rate = jack_get_sample_rate(d_jack_client); diff --git a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc index a171cd8485..9dc7e4ccc4 100644 --- a/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc +++ b/gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc @@ -65,8 +65,8 @@ void atsc_trellis_encoder_impl::encode(atsc_data_segment out[NCODERS], unsigned char out_copy[OUTPUT_SIZE]; unsigned char in_copy[INPUT_SIZE]; - assert(sizeof(in_copy) == sizeof(in[0].data) * NCODERS); - assert(sizeof(out_copy) == sizeof(out[0].data) * NCODERS); + static_assert(sizeof(in_copy) == sizeof(in[0].data) * NCODERS, "wrong type size"); + static_assert(sizeof(out_copy) == sizeof(out[0].data) * NCODERS, "wrong type size"); // copy input into contiguous temporary buffer for (int i = 0; i < NCODERS; i++) { @@ -207,7 +207,8 @@ void atsc_trellis_encoder_impl::encode_helper(unsigned char output[OUTPUT_SIZE], } /* Chunks */ /* Check up on ourselves */ - assert(0 == (INPUT_SIZE * DIBITS_PER_BYTE) % NCODERS); + static_assert(0 == (INPUT_SIZE * DIBITS_PER_BYTE) % NCODERS, + "size not divisible by NCODERS"); assert(OUTPUT_SIZE == out - output); assert(NCODERS - ENCODER_SEG_BUMP == encoder); } |