diff options
Diffstat (limited to 'gnuradio-core/src/lib/general')
35 files changed, 46 insertions, 11 deletions
diff --git a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc index 4d4d99617b..906a72c4ce 100644 --- a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc +++ b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.cc @@ -28,6 +28,7 @@ #include <gr_io_signature.h> #include <assert.h> #include <stdexcept> +#include <string.h> //define ALIGN_ADVANCED_IMPLEMENTATION to have an alternative implementation of the align algoritm which exactly follows the align_interval spec. //It is more resource intensive, less tested and probably not needed diff --git a/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc b/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc index ab91f57e89..61abd72b86 100644 --- a/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc +++ b/gnuradio-core/src/lib/general/gr_bin_statistics_f.cc @@ -26,6 +26,7 @@ #include <gr_bin_statistics_f.h> #include <gr_io_signature.h> +#include <string.h> gr_bin_statistics_f_sptr gr_make_bin_statistics_f(unsigned int vlen, diff --git a/gnuradio-core/src/lib/general/gr_circular_file.cc b/gnuradio-core/src/lib/general/gr_circular_file.cc index 6f605419e1..468b49a108 100644 --- a/gnuradio-core/src/lib/general/gr_circular_file.cc +++ b/gnuradio-core/src/lib/general/gr_circular_file.cc @@ -39,6 +39,8 @@ #include <stdlib.h> #include <algorithm> +#include <stdio.h> +#include <string.h> static const int HEADER_SIZE = 4096; static const int HEADER_MAGIC = 0xEB021026; diff --git a/gnuradio-core/src/lib/general/gr_delay.cc b/gnuradio-core/src/lib/general/gr_delay.cc index a5709c1e7d..d52faca39a 100644 --- a/gnuradio-core/src/lib/general/gr_delay.cc +++ b/gnuradio-core/src/lib/general/gr_delay.cc @@ -26,6 +26,7 @@ #include <gr_delay.h> #include <gr_io_signature.h> +#include <string.h> gr_delay_sptr gr_make_delay (size_t itemsize, int delay) diff --git a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc index accd25fb82..02385c59e4 100644 --- a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc +++ b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.cc @@ -28,6 +28,7 @@ #include <gr_io_signature.h> #include <string.h> #include <stdexcept> +#include <string.h> static const int PAD_VAL = 0xAA; diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc.cc b/gnuradio-core/src/lib/general/gr_fft_vcc.cc index 05de7fbd4f..d07f6fa078 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vcc.cc +++ b/gnuradio-core/src/lib/general/gr_fft_vcc.cc @@ -29,6 +29,7 @@ #include <gr_io_signature.h> #include <gri_fft.h> #include <math.h> +#include <string.h> gr_fft_vcc_sptr gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> &window, bool shift) diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc index a70be014cf..f69d2e84eb 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc +++ b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc @@ -28,6 +28,7 @@ #include <gr_io_signature.h> #include <gri_fft.h> #include <math.h> +#include <string.h> gr_fft_vcc_sptr gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> &window, bool shift) diff --git a/gnuradio-core/src/lib/general/gr_fft_vfc.cc b/gnuradio-core/src/lib/general/gr_fft_vfc.cc index f6c14f9811..c954e4443a 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vfc.cc +++ b/gnuradio-core/src/lib/general/gr_fft_vfc.cc @@ -29,6 +29,7 @@ #include <gri_fft.h> #include <math.h> #include <stdexcept> +#include <string.h> // FIXME after this is working, change to use native real to complex fft. diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc b/gnuradio-core/src/lib/general/gr_framer_sink_1.cc index 711345ed54..9da271bac7 100644 --- a/gnuradio-core/src/lib/general/gr_framer_sink_1.cc +++ b/gnuradio-core/src/lib/general/gr_framer_sink_1.cc @@ -28,6 +28,7 @@ #include <gr_io_signature.h> #include <cstdio> #include <stdexcept> +#include <string.h> #define VERBOSE 0 diff --git a/gnuradio-core/src/lib/general/gr_head.cc b/gnuradio-core/src/lib/general/gr_head.cc index 7f0506cd94..94a00cc68d 100644 --- a/gnuradio-core/src/lib/general/gr_head.cc +++ b/gnuradio-core/src/lib/general/gr_head.cc @@ -25,6 +25,7 @@ #endif #include <gr_head.h> #include <gr_io_signature.h> +#include <string.h> gr_head::gr_head (size_t sizeof_stream_item, int nitems) : gr_sync_block ("head", diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc index 9fb99ea3e7..e38240a3f6 100644 --- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc +++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.cc @@ -26,6 +26,7 @@ #include <gr_keep_one_in_n.h> #include <gr_io_signature.h> +#include <string.h> gr_keep_one_in_n_sptr gr_make_keep_one_in_n (size_t item_size, int n) diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h index 058fcfff21..4ea4209203 100644 --- a/gnuradio-core/src/lib/general/gr_log2_const.h +++ b/gnuradio-core/src/lib/general/gr_log2_const.h @@ -31,16 +31,16 @@ template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; } -template<> static inline int gr_log2_const<1>() { return 0; } -template<> static inline int gr_log2_const<2>() { return 1; } -template<> static inline int gr_log2_const<4>() { return 2; } -template<> static inline int gr_log2_const<8>() { return 3; } -template<> static inline int gr_log2_const<16>() { return 4; } -template<> static inline int gr_log2_const<32>() { return 5; } -template<> static inline int gr_log2_const<64>() { return 6; } -template<> static inline int gr_log2_const<128>() { return 7; } -template<> static inline int gr_log2_const<256>() { return 8; } -template<> static inline int gr_log2_const<512>() { return 9; } -template<> static inline int gr_log2_const<1024>(){ return 10; } +template<> inline int gr_log2_const<1>() { return 0; } +template<> inline int gr_log2_const<2>() { return 1; } +template<> inline int gr_log2_const<4>() { return 2; } +template<> inline int gr_log2_const<8>() { return 3; } +template<> inline int gr_log2_const<16>() { return 4; } +template<> inline int gr_log2_const<32>() { return 5; } +template<> inline int gr_log2_const<64>() { return 6; } +template<> inline int gr_log2_const<128>() { return 7; } +template<> inline int gr_log2_const<256>() { return 8; } +template<> inline int gr_log2_const<512>() { return 9; } +template<> inline int gr_log2_const<1024>(){ return 10; } #endif /* INCLUDED_GR_LOG2_CONST_H */ diff --git a/gnuradio-core/src/lib/general/gr_null_source.cc b/gnuradio-core/src/lib/general/gr_null_source.cc index 82853ccf5a..d11976e1b4 100644 --- a/gnuradio-core/src/lib/general/gr_null_source.cc +++ b/gnuradio-core/src/lib/general/gr_null_source.cc @@ -26,6 +26,7 @@ #include <gr_null_source.h> #include <gr_io_signature.h> +#include <string.h> gr_null_source::gr_null_source (size_t sizeof_stream_item) : gr_sync_block ("null_source", diff --git a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc index f634ed3f63..7865843571 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_bpsk_mapper.cc @@ -27,6 +27,7 @@ #include <gr_ofdm_bpsk_mapper.h> #include <gr_io_signature.h> #include <stdexcept> +#include <string.h> gr_ofdm_bpsk_mapper_sptr gr_make_ofdm_bpsk_mapper (unsigned int msgq_limit, diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc index ab0c31a2c0..7e4996b0bb 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc @@ -32,6 +32,7 @@ #include <cstdio> #include <stdexcept> #include <iostream> +#include <string.h> #define VERBOSE 0 diff --git a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc b/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc index ba7a010ea4..3706c36725 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc @@ -27,6 +27,7 @@ #include <gr_io_signature.h> #include <stdexcept> #include <iostream> +#include <string.h> gr_ofdm_insert_preamble_sptr gr_make_ofdm_insert_preamble(int fft_length, diff --git a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc b/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc index 0a3602cb21..56701b3c11 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc @@ -28,6 +28,7 @@ #include <gr_ofdm_mapper_bcv.h> #include <gr_io_signature.h> #include <stdexcept> +#include <string.h> gr_ofdm_mapper_bcv_sptr gr_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsigned int msgq_limit, diff --git a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc index 79d2a06c74..433b3bc310 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_qam_mapper.cc @@ -27,6 +27,7 @@ #include <gr_ofdm_qam_mapper.h> #include <gr_io_signature.h> #include <stdexcept> +#include <string.h> gr_ofdm_qam_mapper_sptr gr_make_ofdm_qam_mapper (unsigned int msgq_limit, diff --git a/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc b/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc index 39c5bbdee8..2c6fe5a558 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc +++ b/gnuradio-core/src/lib/general/gr_ofdm_qpsk_mapper.cc @@ -27,6 +27,7 @@ #include <gr_ofdm_qpsk_mapper.h> #include <gr_io_signature.h> #include <stdexcept> +#include <string.h> gr_ofdm_qpsk_mapper_sptr gr_make_ofdm_qpsk_mapper (unsigned int msgq_limit, diff --git a/gnuradio-core/src/lib/general/gr_packet_sink.cc b/gnuradio-core/src/lib/general/gr_packet_sink.cc index 8e8225112f..0979f76d3d 100644 --- a/gnuradio-core/src/lib/general/gr_packet_sink.cc +++ b/gnuradio-core/src/lib/general/gr_packet_sink.cc @@ -33,6 +33,7 @@ #include <fcntl.h> #include <stdexcept> #include <gr_count_bits.h> +#include <string.h> #define VERBOSE 0 diff --git a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc index a84cf189f8..4f927bffe6 100644 --- a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc +++ b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.cc @@ -26,6 +26,7 @@ #include <gr_peak_detector2_fb.h> #include <gr_io_signature.h> +#include <string.h> gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float threshold_factor_rise, diff --git a/gnuradio-core/src/lib/general/gr_repeat.cc b/gnuradio-core/src/lib/general/gr_repeat.cc index 5d6f93b30e..aa1e17701d 100644 --- a/gnuradio-core/src/lib/general/gr_repeat.cc +++ b/gnuradio-core/src/lib/general/gr_repeat.cc @@ -26,6 +26,7 @@ #include <gr_repeat.h> #include <gr_io_signature.h> +#include <string.h> gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp) diff --git a/gnuradio-core/src/lib/general/gr_simple_correlator.cc b/gnuradio-core/src/lib/general/gr_simple_correlator.cc index 5638ff7212..0d575694b8 100644 --- a/gnuradio-core/src/lib/general/gr_simple_correlator.cc +++ b/gnuradio-core/src/lib/general/gr_simple_correlator.cc @@ -30,6 +30,7 @@ #include <assert.h> #include <stdexcept> #include <gr_count_bits.h> +#include <string.h> static const int THRESHOLD = 3; diff --git a/gnuradio-core/src/lib/general/gr_simple_framer.cc b/gnuradio-core/src/lib/general/gr_simple_framer.cc index 33ae74e64e..d2de095462 100644 --- a/gnuradio-core/src/lib/general/gr_simple_framer.cc +++ b/gnuradio-core/src/lib/general/gr_simple_framer.cc @@ -29,6 +29,7 @@ #include <gr_io_signature.h> #include <assert.h> #include <stdexcept> +#include <string.h> gr_simple_framer_sptr diff --git a/gnuradio-core/src/lib/general/gr_skiphead.cc b/gnuradio-core/src/lib/general/gr_skiphead.cc index 82b3390cf2..45e3d5cb23 100644 --- a/gnuradio-core/src/lib/general/gr_skiphead.cc +++ b/gnuradio-core/src/lib/general/gr_skiphead.cc @@ -25,6 +25,7 @@ #endif #include <gr_skiphead.h> #include <gr_io_signature.h> +#include <string.h> gr_skiphead::gr_skiphead (size_t itemsize, size_t nitems_to_skip) : gr_block ("skiphead", diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.cc b/gnuradio-core/src/lib/general/gr_stream_mux.cc index 763bcf220a..8ba1384713 100644 --- a/gnuradio-core/src/lib/general/gr_stream_mux.cc +++ b/gnuradio-core/src/lib/general/gr_stream_mux.cc @@ -26,6 +26,7 @@ #include <gr_stream_mux.h> #include <gr_io_signature.h> +#include <string.h> #define VERBOSE 0 diff --git a/gnuradio-core/src/lib/general/gr_stream_to_streams.cc b/gnuradio-core/src/lib/general/gr_stream_to_streams.cc index 1efbe31b67..b38a8d4d81 100644 --- a/gnuradio-core/src/lib/general/gr_stream_to_streams.cc +++ b/gnuradio-core/src/lib/general/gr_stream_to_streams.cc @@ -26,6 +26,7 @@ #include <gr_stream_to_streams.h> #include <gr_io_signature.h> +#include <string.h> gr_stream_to_streams_sptr gr_make_stream_to_streams (size_t item_size, size_t nstreams) diff --git a/gnuradio-core/src/lib/general/gr_stream_to_vector.cc b/gnuradio-core/src/lib/general/gr_stream_to_vector.cc index 739d38d83e..fd233adca7 100644 --- a/gnuradio-core/src/lib/general/gr_stream_to_vector.cc +++ b/gnuradio-core/src/lib/general/gr_stream_to_vector.cc @@ -26,6 +26,7 @@ #include <gr_stream_to_vector.h> #include <gr_io_signature.h> +#include <string.h> gr_stream_to_vector_sptr gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block) diff --git a/gnuradio-core/src/lib/general/gr_streams_to_stream.cc b/gnuradio-core/src/lib/general/gr_streams_to_stream.cc index f4c939e7c4..6f6b49a82c 100644 --- a/gnuradio-core/src/lib/general/gr_streams_to_stream.cc +++ b/gnuradio-core/src/lib/general/gr_streams_to_stream.cc @@ -26,6 +26,7 @@ #include <gr_streams_to_stream.h> #include <gr_io_signature.h> +#include <string.h> gr_streams_to_stream_sptr gr_make_streams_to_stream (size_t item_size, size_t nstreams) diff --git a/gnuradio-core/src/lib/general/gr_streams_to_vector.cc b/gnuradio-core/src/lib/general/gr_streams_to_vector.cc index c0d130b538..f3ee2c49aa 100644 --- a/gnuradio-core/src/lib/general/gr_streams_to_vector.cc +++ b/gnuradio-core/src/lib/general/gr_streams_to_vector.cc @@ -26,6 +26,7 @@ #include <gr_streams_to_vector.h> #include <gr_io_signature.h> +#include <string.h> gr_streams_to_vector_sptr gr_make_streams_to_vector (size_t item_size, size_t nstreams) diff --git a/gnuradio-core/src/lib/general/gr_test.cc b/gnuradio-core/src/lib/general/gr_test.cc index 9698c23a73..a04554ec4e 100644 --- a/gnuradio-core/src/lib/general/gr_test.cc +++ b/gnuradio-core/src/lib/general/gr_test.cc @@ -28,6 +28,7 @@ #include <gr_io_signature.h> #include <stdexcept> #include <iostream> +#include <string.h> gr_test_sptr gr_make_test (const std::string &name, int min_inputs, int max_inputs, unsigned int sizeof_input_item, diff --git a/gnuradio-core/src/lib/general/gr_throttle.cc b/gnuradio-core/src/lib/general/gr_throttle.cc index 87ae5e979a..88219c1c80 100644 --- a/gnuradio-core/src/lib/general/gr_throttle.cc +++ b/gnuradio-core/src/lib/general/gr_throttle.cc @@ -29,6 +29,7 @@ #include <errno.h> #include <stdio.h> #include <math.h> +#include <string.h> #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/gnuradio-core/src/lib/general/gr_vector_to_stream.cc b/gnuradio-core/src/lib/general/gr_vector_to_stream.cc index 39650aea64..149bc0d5bf 100644 --- a/gnuradio-core/src/lib/general/gr_vector_to_stream.cc +++ b/gnuradio-core/src/lib/general/gr_vector_to_stream.cc @@ -26,6 +26,7 @@ #include <gr_vector_to_stream.h> #include <gr_io_signature.h> +#include <string.h> gr_vector_to_stream_sptr gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block) diff --git a/gnuradio-core/src/lib/general/gr_vector_to_streams.cc b/gnuradio-core/src/lib/general/gr_vector_to_streams.cc index cd3d82794b..19f15b1706 100644 --- a/gnuradio-core/src/lib/general/gr_vector_to_streams.cc +++ b/gnuradio-core/src/lib/general/gr_vector_to_streams.cc @@ -26,6 +26,7 @@ #include <gr_vector_to_streams.h> #include <gr_io_signature.h> +#include <string.h> gr_vector_to_streams_sptr gr_make_vector_to_streams (size_t item_size, size_t nstreams) diff --git a/gnuradio-core/src/lib/general/malloc16.c b/gnuradio-core/src/lib/general/malloc16.c index 2cc6135e77..3317514998 100644 --- a/gnuradio-core/src/lib/general/malloc16.c +++ b/gnuradio-core/src/lib/general/malloc16.c @@ -7,6 +7,7 @@ #include "malloc16.h" #include <string.h> +#include <strings.h> void *malloc16Align(int size){ void *p; |