summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/include/gnuradio/digital/adaptive_algorithm.h2
-rw-r--r--gr-digital/include/gnuradio/digital/header_buffer.h4
-rw-r--r--gr-digital/include/gnuradio/digital/lfsr.h2
-rw-r--r--gr-digital/lib/chunks_to_symbols_impl.cc2
-rw-r--r--gr-digital/lib/constellation_encoder_bc_impl.h4
-rw-r--r--gr-digital/lib/decision_feedback_equalizer_impl.cc4
-rw-r--r--gr-digital/lib/header_buffer.cc2
-rw-r--r--gr-digital/lib/header_format_base.cc2
-rw-r--r--gr-digital/lib/header_format_counter.cc2
-rw-r--r--gr-digital/lib/header_format_crc.cc2
-rw-r--r--gr-digital/lib/header_format_default.cc2
-rw-r--r--gr-digital/lib/header_format_ofdm.cc2
-rw-r--r--gr-digital/lib/linear_equalizer_impl.cc4
-rw-r--r--gr-digital/lib/packet_header_default.cc2
-rw-r--r--gr-digital/lib/packet_sink_impl.cc4
-rw-r--r--gr-digital/lib/protocol_formatter_async_impl.cc2
-rw-r--r--gr-digital/lib/protocol_formatter_bb_impl.cc2
-rw-r--r--gr-digital/lib/qa_header_buffer.cc2
-rw-r--r--gr-digital/lib/qa_header_format.cc2
-rw-r--r--gr-digital/lib/simple_correlator_impl.cc4
-rw-r--r--gr-digital/lib/simple_framer_impl.cc2
-rw-r--r--gr-digital/python/digital/bindings/adaptive_algorithm_python.cc2
-rw-r--r--gr-digital/python/digital/bindings/header_buffer_python.cc2
-rw-r--r--gr-digital/python/digital/bindings/lfsr_python.cc2
24 files changed, 30 insertions, 30 deletions
diff --git a/gr-digital/include/gnuradio/digital/adaptive_algorithm.h b/gr-digital/include/gnuradio/digital/adaptive_algorithm.h
index 670bb17373..fff56f6963 100644
--- a/gr-digital/include/gnuradio/digital/adaptive_algorithm.h
+++ b/gr-digital/include/gnuradio/digital/adaptive_algorithm.h
@@ -14,8 +14,8 @@
#include <gnuradio/digital/api.h>
#include <gnuradio/digital/constellation.h>
#include <gnuradio/math.h>
-#include <math.h>
#include <algorithm>
+#include <cmath>
#include <vector>
namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/header_buffer.h b/gr-digital/include/gnuradio/digital/header_buffer.h
index ba6e4ee3cc..6e1e3cc75f 100644
--- a/gr-digital/include/gnuradio/digital/header_buffer.h
+++ b/gr-digital/include/gnuradio/digital/header_buffer.h
@@ -11,8 +11,8 @@
#define INCLUDED_DIGITAL_HEADER_BUFFER_H
#include <gnuradio/digital/api.h>
-#include <stdint.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdlib>
#include <vector>
namespace gr {
diff --git a/gr-digital/include/gnuradio/digital/lfsr.h b/gr-digital/include/gnuradio/digital/lfsr.h
index 697ddb84ad..b32eae8136 100644
--- a/gr-digital/include/gnuradio/digital/lfsr.h
+++ b/gr-digital/include/gnuradio/digital/lfsr.h
@@ -12,7 +12,7 @@
#define INCLUDED_DIGITAL_LFSR_H
#include <gnuradio/digital/api.h>
-#include <stdint.h>
+#include <cstdint>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc
index de84eb98a5..76bcac8823 100644
--- a/gr-digital/lib/chunks_to_symbols_impl.cc
+++ b/gr-digital/lib/chunks_to_symbols_impl.cc
@@ -15,7 +15,7 @@
#include "chunks_to_symbols_impl.h"
#include <gnuradio/io_signature.h>
#include <gnuradio/tag_checker.h>
-#include <assert.h>
+#include <cassert>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/constellation_encoder_bc_impl.h b/gr-digital/lib/constellation_encoder_bc_impl.h
index 9b84403305..122a570923 100644
--- a/gr-digital/lib/constellation_encoder_bc_impl.h
+++ b/gr-digital/lib/constellation_encoder_bc_impl.h
@@ -23,11 +23,11 @@ private:
public:
constellation_encoder_bc_impl(constellation_sptr constellation);
- ~constellation_encoder_bc_impl();
+ ~constellation_encoder_bc_impl() override;
int work(int noutput_items,
gr_vector_const_void_star& input_items,
- gr_vector_void_star& output_items);
+ gr_vector_void_star& output_items) override;
};
} /* namespace digital */
diff --git a/gr-digital/lib/decision_feedback_equalizer_impl.cc b/gr-digital/lib/decision_feedback_equalizer_impl.cc
index 9178ee4a87..9fe86d6af4 100644
--- a/gr-digital/lib/decision_feedback_equalizer_impl.cc
+++ b/gr-digital/lib/decision_feedback_equalizer_impl.cc
@@ -82,7 +82,7 @@ decision_feedback_equalizer_impl::decision_feedback_equalizer_impl(
// not reversed at this point
d_new_taps[0] = gr_complex(1.0, 0.0); // help things along with initialized taps
- if (training_start_tag == "" || training_sequence.empty()) {
+ if (training_start_tag.empty() || training_sequence.empty()) {
d_training_state = equalizer_state_t::DD;
} else {
d_training_state = equalizer_state_t::IDLE;
@@ -206,7 +206,7 @@ int decision_feedback_equalizer_impl::equalize(
if (state)
state[i] = (unsigned short)d_training_state;
- if (training_start_samples.size() > 0 &&
+ if (!training_start_samples.empty() &&
tag_index < training_start_samples.size()) {
int tag_sample = training_start_samples[tag_index];
if (tag_sample >= j && tag_sample < (j + (int)decimation())) {
diff --git a/gr-digital/lib/header_buffer.cc b/gr-digital/lib/header_buffer.cc
index 1812198c90..534ca451ba 100644
--- a/gr-digital/lib/header_buffer.cc
+++ b/gr-digital/lib/header_buffer.cc
@@ -12,9 +12,9 @@
#endif
#include <gnuradio/digital/header_buffer.h>
-#include <string.h>
#include <volk/volk.h>
#include <algorithm>
+#include <cstring>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/header_format_base.cc b/gr-digital/lib/header_format_base.cc
index 10a15e55d6..fdf16c196d 100644
--- a/gr-digital/lib/header_format_base.cc
+++ b/gr-digital/lib/header_format_base.cc
@@ -13,8 +13,8 @@
#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/math.h>
-#include <string.h>
#include <volk/volk.h>
+#include <cstring>
#include <iostream>
namespace gr {
diff --git a/gr-digital/lib/header_format_counter.cc b/gr-digital/lib/header_format_counter.cc
index cbf641fc2e..bf5485f1e1 100644
--- a/gr-digital/lib/header_format_counter.cc
+++ b/gr-digital/lib/header_format_counter.cc
@@ -14,8 +14,8 @@
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/digital/header_format_counter.h>
#include <gnuradio/math.h>
-#include <string.h>
#include <volk/volk_alloc.hh>
+#include <cstring>
#include <iomanip>
#include <iostream>
diff --git a/gr-digital/lib/header_format_crc.cc b/gr-digital/lib/header_format_crc.cc
index b779e1c09b..d53f4eb7ed 100644
--- a/gr-digital/lib/header_format_crc.cc
+++ b/gr-digital/lib/header_format_crc.cc
@@ -13,8 +13,8 @@
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/digital/header_format_crc.h>
-#include <string.h>
#include <volk/volk_alloc.hh>
+#include <cstring>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/header_format_default.cc b/gr-digital/lib/header_format_default.cc
index a37ad14181..645046b5c8 100644
--- a/gr-digital/lib/header_format_default.cc
+++ b/gr-digital/lib/header_format_default.cc
@@ -13,8 +13,8 @@
#include <gnuradio/digital/header_format_default.h>
#include <gnuradio/math.h>
-#include <string.h>
#include <volk/volk_alloc.hh>
+#include <cstring>
#include <iostream>
namespace gr {
diff --git a/gr-digital/lib/header_format_ofdm.cc b/gr-digital/lib/header_format_ofdm.cc
index aa72d28c5d..0aeeab3a2f 100644
--- a/gr-digital/lib/header_format_ofdm.cc
+++ b/gr-digital/lib/header_format_ofdm.cc
@@ -14,8 +14,8 @@
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/digital/header_format_ofdm.h>
#include <gnuradio/digital/lfsr.h>
-#include <string.h>
#include <volk/volk.h>
+#include <cstring>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/linear_equalizer_impl.cc b/gr-digital/lib/linear_equalizer_impl.cc
index f3f9736270..657f5bb258 100644
--- a/gr-digital/lib/linear_equalizer_impl.cc
+++ b/gr-digital/lib/linear_equalizer_impl.cc
@@ -66,7 +66,7 @@ linear_equalizer_impl::linear_equalizer_impl(unsigned num_taps,
d_updated(false),
d_training_sample(0)
{
- if (training_start_tag == "" || training_sequence.empty()) {
+ if (training_start_tag.empty() || training_sequence.empty()) {
d_training_state = equalizer_state_t::DD;
} else {
d_training_state = equalizer_state_t::IDLE;
@@ -134,7 +134,7 @@ int linear_equalizer_impl::equalize(const gr_complex* input_samples,
state[i] = (unsigned short)d_training_state;
}
- if (training_start_samples.size() > 0 &&
+ if (!training_start_samples.empty() &&
tag_index < training_start_samples.size()) {
unsigned int tag_sample = training_start_samples[tag_index];
if (tag_sample >= j && tag_sample < (j + decimation())) {
diff --git a/gr-digital/lib/packet_header_default.cc b/gr-digital/lib/packet_header_default.cc
index f958bddf52..0b3692bc9d 100644
--- a/gr-digital/lib/packet_header_default.cc
+++ b/gr-digital/lib/packet_header_default.cc
@@ -12,7 +12,7 @@
#endif
#include <gnuradio/digital/packet_header_default.h>
-#include <string.h>
+#include <cstring>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/packet_sink_impl.cc b/gr-digital/lib/packet_sink_impl.cc
index 88ec21f32f..ad16adb24f 100644
--- a/gr-digital/lib/packet_sink_impl.cc
+++ b/gr-digital/lib/packet_sink_impl.cc
@@ -15,12 +15,12 @@
#include "packet_sink_impl.h"
#include <gnuradio/blocks/count_bits.h>
#include <gnuradio/io_signature.h>
-#include <errno.h>
#include <fcntl.h>
-#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <cerrno>
#include <cstdio>
+#include <cstring>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc
index 2b6a742057..b2c90a4cd4 100644
--- a/gr-digital/lib/protocol_formatter_async_impl.cc
+++ b/gr-digital/lib/protocol_formatter_async_impl.cc
@@ -14,8 +14,8 @@
#include "protocol_formatter_async_impl.h"
#include <gnuradio/io_signature.h>
-#include <stdio.h>
#include <volk/volk_alloc.hh>
+#include <cstdio>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/protocol_formatter_bb_impl.cc b/gr-digital/lib/protocol_formatter_bb_impl.cc
index e613f1f019..fef288d729 100644
--- a/gr-digital/lib/protocol_formatter_bb_impl.cc
+++ b/gr-digital/lib/protocol_formatter_bb_impl.cc
@@ -14,8 +14,8 @@
#include "protocol_formatter_bb_impl.h"
#include <gnuradio/io_signature.h>
-#include <stdio.h>
#include <volk/volk.h>
+#include <cstdio>
namespace gr {
namespace digital {
diff --git a/gr-digital/lib/qa_header_buffer.cc b/gr-digital/lib/qa_header_buffer.cc
index 3fa22e5883..d17799a472 100644
--- a/gr-digital/lib/qa_header_buffer.cc
+++ b/gr-digital/lib/qa_header_buffer.cc
@@ -14,9 +14,9 @@
#include <gnuradio/attributes.h>
#include <gnuradio/digital/header_buffer.h>
-#include <stdio.h>
#include <volk/volk_alloc.hh>
#include <boost/test/unit_test.hpp>
+#include <cstdio>
BOOST_AUTO_TEST_CASE(test_add8)
{
diff --git a/gr-digital/lib/qa_header_format.cc b/gr-digital/lib/qa_header_format.cc
index 072f241062..1f8bc8e333 100644
--- a/gr-digital/lib/qa_header_format.cc
+++ b/gr-digital/lib/qa_header_format.cc
@@ -18,10 +18,10 @@
#include <gnuradio/digital/header_format_default.h>
#include <gnuradio/expj.h>
#include <gnuradio/xoroshiro128p.h>
-#include <stdio.h>
#include <volk/volk_alloc.hh>
#include <boost/test/unit_test.hpp>
#include <cmath>
+#include <cstdio>
static void
xoroshiro_fill_buffer(uint8_t* buffer, unsigned int length, uint64_t seed = 42)
diff --git a/gr-digital/lib/simple_correlator_impl.cc b/gr-digital/lib/simple_correlator_impl.cc
index e150bcf706..c9a9a995fa 100644
--- a/gr-digital/lib/simple_correlator_impl.cc
+++ b/gr-digital/lib/simple_correlator_impl.cc
@@ -16,9 +16,9 @@
#include <gnuradio/blocks/count_bits.h>
#include <gnuradio/digital/simple_framer_sync.h>
#include <gnuradio/io_signature.h>
-#include <assert.h>
-#include <string.h>
+#include <cassert>
#include <cstdio>
+#include <cstring>
#include <stdexcept>
namespace gr {
diff --git a/gr-digital/lib/simple_framer_impl.cc b/gr-digital/lib/simple_framer_impl.cc
index 27d3089031..13eb29c78c 100644
--- a/gr-digital/lib/simple_framer_impl.cc
+++ b/gr-digital/lib/simple_framer_impl.cc
@@ -15,7 +15,7 @@
#include "simple_framer_impl.h"
#include <gnuradio/digital/simple_framer_sync.h>
#include <gnuradio/io_signature.h>
-#include <assert.h>
+#include <cassert>
#include <string>
namespace gr {
diff --git a/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc b/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
index e3ce6b084e..cca2f3a8e2 100644
--- a/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
+++ b/gr-digital/python/digital/bindings/adaptive_algorithm_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(adaptive_algorithm.h) */
-/* BINDTOOL_HEADER_FILE_HASH(33c5f79e6e5a87ff26075b7aa45a61c4) */
+/* BINDTOOL_HEADER_FILE_HASH(a13b47b8abd39d82742a594477210648) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-digital/python/digital/bindings/header_buffer_python.cc b/gr-digital/python/digital/bindings/header_buffer_python.cc
index fc632ebef0..716f3cc5c6 100644
--- a/gr-digital/python/digital/bindings/header_buffer_python.cc
+++ b/gr-digital/python/digital/bindings/header_buffer_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(header_buffer.h) */
-/* BINDTOOL_HEADER_FILE_HASH(fa6a18f60473f6981e632c4cf3005793) */
+/* BINDTOOL_HEADER_FILE_HASH(22afb7f4d4128f03a2a8f67f1e6ea6e0) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-digital/python/digital/bindings/lfsr_python.cc b/gr-digital/python/digital/bindings/lfsr_python.cc
index 245e2256f3..8efe61e005 100644
--- a/gr-digital/python/digital/bindings/lfsr_python.cc
+++ b/gr-digital/python/digital/bindings/lfsr_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(lfsr.h) */
-/* BINDTOOL_HEADER_FILE_HASH(a9c9bd5cfce2d712fcbd9401773e8621) */
+/* BINDTOOL_HEADER_FILE_HASH(6ad566b46874d5852d96814797e67bc4) */
/***********************************************************************************/
#include <pybind11/complex.h>