diff options
Diffstat (limited to 'gr-blocks/lib')
59 files changed, 99 insertions, 100 deletions
diff --git a/gr-blocks/lib/annotator_1to1_impl.h b/gr-blocks/lib/annotator_1to1_impl.h index 446f2ec0c8..c87b6e5ef0 100644 --- a/gr-blocks/lib/annotator_1to1_impl.h +++ b/gr-blocks/lib/annotator_1to1_impl.h @@ -19,7 +19,7 @@ namespace blocks { class annotator_1to1_impl : public annotator_1to1 { private: - uint64_t d_when; + const uint64_t d_when; uint64_t d_tag_counter; std::vector<tag_t> d_stored_tags; diff --git a/gr-blocks/lib/annotator_alltoall_impl.h b/gr-blocks/lib/annotator_alltoall_impl.h index 4f3b59a0bb..faac03c6e2 100644 --- a/gr-blocks/lib/annotator_alltoall_impl.h +++ b/gr-blocks/lib/annotator_alltoall_impl.h @@ -19,7 +19,7 @@ namespace blocks { class annotator_alltoall_impl : public annotator_alltoall { private: - uint64_t d_when; + const uint64_t d_when; uint64_t d_tag_counter; std::vector<tag_t> d_stored_tags; diff --git a/gr-blocks/lib/annotator_raw_impl.h b/gr-blocks/lib/annotator_raw_impl.h index 9bce4031dc..7c8093ea1b 100644 --- a/gr-blocks/lib/annotator_raw_impl.h +++ b/gr-blocks/lib/annotator_raw_impl.h @@ -20,7 +20,7 @@ namespace blocks { class annotator_raw_impl : public annotator_raw { private: - size_t d_itemsize; + const size_t d_itemsize; std::vector<tag_t> d_queued_tags; gr::thread::mutex d_mutex; diff --git a/gr-blocks/lib/bin_statistics_f_impl.h b/gr-blocks/lib/bin_statistics_f_impl.h index 74b1104573..42a838f3cd 100644 --- a/gr-blocks/lib/bin_statistics_f_impl.h +++ b/gr-blocks/lib/bin_statistics_f_impl.h @@ -27,8 +27,8 @@ private: const size_t d_vlen; msg_queue::sptr d_msgq; feval_dd* d_tune; - size_t d_tune_delay; - size_t d_dwell_delay; + const size_t d_tune_delay; + const size_t d_dwell_delay; double d_center_freq; state_t d_state; diff --git a/gr-blocks/lib/burst_tagger_impl.h b/gr-blocks/lib/burst_tagger_impl.h index 77ed72f51a..b27d9bf09f 100644 --- a/gr-blocks/lib/burst_tagger_impl.h +++ b/gr-blocks/lib/burst_tagger_impl.h @@ -19,7 +19,7 @@ namespace blocks { class burst_tagger_impl : public burst_tagger { private: - size_t d_itemsize; + const size_t d_itemsize; bool d_state; pmt::pmt_t d_true_key; pmt::pmt_t d_true_value; diff --git a/gr-blocks/lib/complex_to_interleaved_char_impl.h b/gr-blocks/lib/complex_to_interleaved_char_impl.h index 2e7e3c68bd..f4502c4b9d 100644 --- a/gr-blocks/lib/complex_to_interleaved_char_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_char_impl.h @@ -20,7 +20,7 @@ class BLOCKS_API complex_to_interleaved_char_impl : public complex_to_interleave { private: float d_scalar; - bool d_vector; + const bool d_vector; public: complex_to_interleaved_char_impl(bool vector, float scale_factor); diff --git a/gr-blocks/lib/complex_to_interleaved_short_impl.h b/gr-blocks/lib/complex_to_interleaved_short_impl.h index 1b1b294438..fbcf56cd5b 100644 --- a/gr-blocks/lib/complex_to_interleaved_short_impl.h +++ b/gr-blocks/lib/complex_to_interleaved_short_impl.h @@ -20,7 +20,7 @@ class BLOCKS_API complex_to_interleaved_short_impl : public complex_to_interleav { private: float d_scalar; - bool d_vector; + const bool d_vector; public: complex_to_interleaved_short_impl(bool vector, float scale_factor); diff --git a/gr-blocks/lib/copy_impl.h b/gr-blocks/lib/copy_impl.h index ec60f34ef3..162dc796df 100644 --- a/gr-blocks/lib/copy_impl.h +++ b/gr-blocks/lib/copy_impl.h @@ -19,7 +19,7 @@ namespace blocks { class copy_impl : public copy { private: - size_t d_itemsize; + const size_t d_itemsize; bool d_enabled; public: diff --git a/gr-blocks/lib/correctiq_auto_impl.h b/gr-blocks/lib/correctiq_auto_impl.h index 5ad6eea4f0..24e56fc380 100644 --- a/gr-blocks/lib/correctiq_auto_impl.h +++ b/gr-blocks/lib/correctiq_auto_impl.h @@ -24,10 +24,10 @@ private: float d_ratio; gr_complex d_k; - double d_samp_rate; + const double d_samp_rate; double d_freq; float d_gain; - float d_sync_window; + const float d_sync_window; long d_sync_counter; bool d_synchronized; diff --git a/gr-blocks/lib/correctiq_swapiq_impl.cc b/gr-blocks/lib/correctiq_swapiq_impl.cc index dac0fc10fe..3c7a9405dd 100644 --- a/gr-blocks/lib/correctiq_swapiq_impl.cc +++ b/gr-blocks/lib/correctiq_swapiq_impl.cc @@ -29,10 +29,9 @@ swap_iq::sptr swap_iq::make(int datatype, int datasize) swap_iq_impl::swap_iq_impl(int datatype, int datasize) : gr::sync_block("swap_iq", gr::io_signature::make(1, 1, datasize), - gr::io_signature::make(1, 1, datasize)) + gr::io_signature::make(1, 1, datasize)), + d_datatype(datatype) { - d_datatype = datatype; - if (d_datatype != SWAPTYPE_FLOATCOMPLEX) { gr::block::set_output_multiple(2); // Make sure we work with pairs } diff --git a/gr-blocks/lib/correctiq_swapiq_impl.h b/gr-blocks/lib/correctiq_swapiq_impl.h index 5995caa884..6eeaa93ea6 100644 --- a/gr-blocks/lib/correctiq_swapiq_impl.h +++ b/gr-blocks/lib/correctiq_swapiq_impl.h @@ -23,7 +23,7 @@ namespace blocks { class swap_iq_impl : public swap_iq { private: - int d_datatype; + const int d_datatype; public: swap_iq_impl(int datatype, int datasize); diff --git a/gr-blocks/lib/ctrlport_probe2_b_impl.h b/gr-blocks/lib/ctrlport_probe2_b_impl.h index 36089f579e..bc4ffadef2 100644 --- a/gr-blocks/lib/ctrlport_probe2_b_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_b_impl.h @@ -21,10 +21,10 @@ namespace blocks { class ctrlport_probe2_b_impl : public ctrlport_probe2_b { private: - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; size_t d_len; - unsigned int d_disp_mask; + const unsigned int d_disp_mask; size_t d_index; std::vector<signed char> d_buffer; diff --git a/gr-blocks/lib/ctrlport_probe2_c_impl.h b/gr-blocks/lib/ctrlport_probe2_c_impl.h index a0d3262755..b6d94f91ef 100644 --- a/gr-blocks/lib/ctrlport_probe2_c_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_c_impl.h @@ -21,10 +21,10 @@ namespace blocks { class ctrlport_probe2_c_impl : public ctrlport_probe2_c { private: - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; size_t d_len; - unsigned int d_disp_mask; + const unsigned int d_disp_mask; size_t d_index; std::vector<gr_complex> d_buffer; diff --git a/gr-blocks/lib/ctrlport_probe2_f_impl.h b/gr-blocks/lib/ctrlport_probe2_f_impl.h index 08a3b011af..75ed009098 100644 --- a/gr-blocks/lib/ctrlport_probe2_f_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_f_impl.h @@ -21,10 +21,10 @@ namespace blocks { class ctrlport_probe2_f_impl : public ctrlport_probe2_f { private: - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; size_t d_len; - unsigned int d_disp_mask; + const unsigned int d_disp_mask; size_t d_index; std::vector<float> d_buffer; diff --git a/gr-blocks/lib/ctrlport_probe2_i_impl.h b/gr-blocks/lib/ctrlport_probe2_i_impl.h index e946499f8c..45745e5698 100644 --- a/gr-blocks/lib/ctrlport_probe2_i_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_i_impl.h @@ -21,10 +21,10 @@ namespace blocks { class ctrlport_probe2_i_impl : public ctrlport_probe2_i { private: - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; size_t d_len; - unsigned int d_disp_mask; + const unsigned int d_disp_mask; size_t d_index; std::vector<int> d_buffer; diff --git a/gr-blocks/lib/ctrlport_probe2_s_impl.h b/gr-blocks/lib/ctrlport_probe2_s_impl.h index b967e9551d..8f0de2d93a 100644 --- a/gr-blocks/lib/ctrlport_probe2_s_impl.h +++ b/gr-blocks/lib/ctrlport_probe2_s_impl.h @@ -21,10 +21,10 @@ namespace blocks { class ctrlport_probe2_s_impl : public ctrlport_probe2_s { private: - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; size_t d_len; - unsigned int d_disp_mask; + const unsigned int d_disp_mask; size_t d_index; std::vector<short> d_buffer; diff --git a/gr-blocks/lib/ctrlport_probe_c_impl.h b/gr-blocks/lib/ctrlport_probe_c_impl.h index a9bccd0fe9..7e961487c0 100644 --- a/gr-blocks/lib/ctrlport_probe_c_impl.h +++ b/gr-blocks/lib/ctrlport_probe_c_impl.h @@ -23,8 +23,8 @@ class ctrlport_probe_c_impl : public ctrlport_probe_c private: boost::shared_mutex ptrlock; - std::string d_id; - std::string d_desc; + const std::string d_id; + const std::string d_desc; const gr_complex* d_ptr; size_t d_ptrLen; diff --git a/gr-blocks/lib/deinterleave_impl.h b/gr-blocks/lib/deinterleave_impl.h index 22dbe19f9c..b00d13cc15 100644 --- a/gr-blocks/lib/deinterleave_impl.h +++ b/gr-blocks/lib/deinterleave_impl.h @@ -19,8 +19,8 @@ namespace blocks { class BLOCKS_API deinterleave_impl : public deinterleave { - size_t d_itemsize; - unsigned int d_blocksize; + const size_t d_itemsize; + const unsigned int d_blocksize; unsigned int d_current_output; unsigned int d_noutputs; unsigned int d_size_bytes; // block size in bytes diff --git a/gr-blocks/lib/delay_impl.h b/gr-blocks/lib/delay_impl.h index cba81542cc..c58de83668 100644 --- a/gr-blocks/lib/delay_impl.h +++ b/gr-blocks/lib/delay_impl.h @@ -22,7 +22,7 @@ class delay_impl : public delay private: void forecast(int noutput_items, gr_vector_int& ninput_items_required); - size_t d_itemsize; + const size_t d_itemsize; int d_delta; gr::thread::mutex d_mutex_delay; diff --git a/gr-blocks/lib/exponentiate_const_cci_impl.h b/gr-blocks/lib/exponentiate_const_cci_impl.h index 030877adcf..29c30e8ab0 100644 --- a/gr-blocks/lib/exponentiate_const_cci_impl.h +++ b/gr-blocks/lib/exponentiate_const_cci_impl.h @@ -20,7 +20,7 @@ class exponentiate_const_cci_impl : public exponentiate_const_cci { private: int d_exponent; - int d_vlen; + const int d_vlen; public: exponentiate_const_cci_impl(int exponent, size_t vlen); diff --git a/gr-blocks/lib/integrate_impl.h b/gr-blocks/lib/integrate_impl.h index 5d3dcb45d1..c0c58cc72c 100644 --- a/gr-blocks/lib/integrate_impl.h +++ b/gr-blocks/lib/integrate_impl.h @@ -20,8 +20,8 @@ namespace blocks { template <class T> class BLOCKS_API integrate_impl : public integrate<T> { - int d_decim; - unsigned int d_vlen; + const int d_decim; + const unsigned int d_vlen; public: integrate_impl(int decim, unsigned int vlen); diff --git a/gr-blocks/lib/interleave_impl.h b/gr-blocks/lib/interleave_impl.h index 3dda137a24..0f01383054 100644 --- a/gr-blocks/lib/interleave_impl.h +++ b/gr-blocks/lib/interleave_impl.h @@ -18,8 +18,8 @@ namespace blocks { class BLOCKS_API interleave_impl : public interleave { - size_t d_itemsize; - unsigned int d_blocksize; + const size_t d_itemsize; + const unsigned int d_blocksize; unsigned int d_ninputs; public: diff --git a/gr-blocks/lib/interleaved_char_to_complex_impl.h b/gr-blocks/lib/interleaved_char_to_complex_impl.h index 211c684943..9b5dcc1b8d 100644 --- a/gr-blocks/lib/interleaved_char_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_char_to_complex_impl.h @@ -20,7 +20,7 @@ class BLOCKS_API interleaved_char_to_complex_impl : public interleaved_char_to_c { private: float d_scalar; - bool d_vector; + const bool d_vector; public: interleaved_char_to_complex_impl(bool vector_input = false, diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h b/gr-blocks/lib/interleaved_short_to_complex_impl.h index 698ac8d7bf..ac054207b2 100644 --- a/gr-blocks/lib/interleaved_short_to_complex_impl.h +++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h @@ -20,7 +20,7 @@ class BLOCKS_API interleaved_short_to_complex_impl : public interleaved_short_to { private: float d_scalar; - bool d_vector; + const bool d_vector; bool d_swap; public: diff --git a/gr-blocks/lib/keep_m_in_n_impl.h b/gr-blocks/lib/keep_m_in_n_impl.h index 946947e25f..49592abeee 100644 --- a/gr-blocks/lib/keep_m_in_n_impl.h +++ b/gr-blocks/lib/keep_m_in_n_impl.h @@ -21,7 +21,7 @@ class BLOCKS_API keep_m_in_n_impl : public keep_m_in_n int d_m; int d_n; int d_offset; - int d_itemsize; + const int d_itemsize; void forecast(int noutput_items, gr_vector_int& ninput_items_required); diff --git a/gr-blocks/lib/max_blk_impl.h b/gr-blocks/lib/max_blk_impl.h index 9100aa4d0a..aba0b3e758 100644 --- a/gr-blocks/lib/max_blk_impl.h +++ b/gr-blocks/lib/max_blk_impl.h @@ -21,7 +21,7 @@ template <class T> class max_blk_impl : public max_blk<T> { private: - size_t d_vlen, d_vlen_out; + const size_t d_vlen, d_vlen_out; public: max_blk_impl(size_t vlen, size_t vlen_out); diff --git a/gr-blocks/lib/min_blk_impl.h b/gr-blocks/lib/min_blk_impl.h index f6f46b95e1..c49082dc5b 100644 --- a/gr-blocks/lib/min_blk_impl.h +++ b/gr-blocks/lib/min_blk_impl.h @@ -21,7 +21,7 @@ template <class T> class min_blk_impl : public min_blk<T> { private: - size_t d_vlen, d_vlen_out; + const size_t d_vlen, d_vlen_out; public: min_blk_impl(size_t vlen, size_t vlen_out); diff --git a/gr-blocks/lib/moving_average_impl.h b/gr-blocks/lib/moving_average_impl.h index 34c74dad5a..eed4533528 100644 --- a/gr-blocks/lib/moving_average_impl.h +++ b/gr-blocks/lib/moving_average_impl.h @@ -26,7 +26,7 @@ private: int d_length; T d_scale; int d_max_iter; - unsigned int d_vlen; + const unsigned int d_vlen; std::vector<T> d_sum; diff --git a/gr-blocks/lib/nlog10_ff_impl.h b/gr-blocks/lib/nlog10_ff_impl.h index 9e35af9ec2..b229b05a64 100644 --- a/gr-blocks/lib/nlog10_ff_impl.h +++ b/gr-blocks/lib/nlog10_ff_impl.h @@ -18,8 +18,8 @@ namespace blocks { class BLOCKS_API nlog10_ff_impl : public nlog10_ff { - float d_n_log2_10; - float d_10_k_n; + const float d_n_log2_10; + const float d_10_k_n; const size_t d_vlen; public: diff --git a/gr-blocks/lib/pdu_to_tagged_stream_impl.h b/gr-blocks/lib/pdu_to_tagged_stream_impl.h index 0fbb4a7c03..97176427dd 100644 --- a/gr-blocks/lib/pdu_to_tagged_stream_impl.h +++ b/gr-blocks/lib/pdu_to_tagged_stream_impl.h @@ -18,7 +18,7 @@ namespace blocks { class BLOCKS_API pdu_to_tagged_stream_impl : public pdu_to_tagged_stream { - size_t d_itemsize; + const size_t d_itemsize; pmt::pmt_t d_curr_meta; pmt::pmt_t d_curr_vect; size_t d_curr_len; diff --git a/gr-blocks/lib/plateau_detector_fb_impl.h b/gr-blocks/lib/plateau_detector_fb_impl.h index 6b8fd576bf..6ea346223c 100644 --- a/gr-blocks/lib/plateau_detector_fb_impl.h +++ b/gr-blocks/lib/plateau_detector_fb_impl.h @@ -19,7 +19,7 @@ namespace blocks { class plateau_detector_fb_impl : public plateau_detector_fb { private: - int d_max_len; + const int d_max_len; float d_threshold; public: diff --git a/gr-blocks/lib/probe_rate_impl.h b/gr-blocks/lib/probe_rate_impl.h index fdec6fa50c..5ebb580ab9 100644 --- a/gr-blocks/lib/probe_rate_impl.h +++ b/gr-blocks/lib/probe_rate_impl.h @@ -20,7 +20,7 @@ class probe_rate_impl : public probe_rate { private: double d_alpha, d_beta, d_avg; - double d_min_update_time; + const double d_min_update_time; boost::posix_time::ptime d_last_update; uint64_t d_lastthru; void setup_rpc(); diff --git a/gr-blocks/lib/probe_signal_v_impl.h b/gr-blocks/lib/probe_signal_v_impl.h index d574bf7b17..6ee5ad7ad1 100644 --- a/gr-blocks/lib/probe_signal_v_impl.h +++ b/gr-blocks/lib/probe_signal_v_impl.h @@ -22,7 +22,7 @@ class probe_signal_v_impl : public probe_signal_v<T> { private: std::vector<T> d_level; - size_t d_size; + const size_t d_size; public: probe_signal_v_impl(size_t size); diff --git a/gr-blocks/lib/random_pdu_impl.h b/gr-blocks/lib/random_pdu_impl.h index b2ecc85d1d..eef29df1c3 100644 --- a/gr-blocks/lib/random_pdu_impl.h +++ b/gr-blocks/lib/random_pdu_impl.h @@ -25,8 +25,8 @@ private: std::mt19937 d_rng; std::uniform_int_distribution<> d_urange; std::uniform_int_distribution<> d_brange; - unsigned char d_mask; - int d_length_modulo; + const unsigned char d_mask; + const int d_length_modulo; public: random_pdu_impl(int min_items, diff --git a/gr-blocks/lib/repack_bits_bb_impl.h b/gr-blocks/lib/repack_bits_bb_impl.h index 81dc862cb0..574aa57c48 100644 --- a/gr-blocks/lib/repack_bits_bb_impl.h +++ b/gr-blocks/lib/repack_bits_bb_impl.h @@ -22,11 +22,11 @@ private: int d_k; //! Bits on input stream int d_l; //! Bits on output stream const bool d_packet_mode; - int d_in_index; // Current bit of input byte - int d_out_index; // Current bit of output byte - bool d_align_output; //! true if the output shall be aligned, false if the input shall - //! be aligned - endianness_t d_endianness; + int d_in_index; // Current bit of input byte + int d_out_index; // Current bit of output byte + const bool d_align_output; //! true if the output shall be aligned, false if the input + //! shall be aligned + const endianness_t d_endianness; protected: int calculate_output_stream_length(const gr_vector_int& ninput_items); diff --git a/gr-blocks/lib/repeat_impl.h b/gr-blocks/lib/repeat_impl.h index 99ae04719c..e0ec9e98d3 100644 --- a/gr-blocks/lib/repeat_impl.h +++ b/gr-blocks/lib/repeat_impl.h @@ -18,7 +18,7 @@ namespace blocks { class BLOCKS_API repeat_impl : public repeat { - size_t d_itemsize; + const size_t d_itemsize; int d_interp; public: diff --git a/gr-blocks/lib/selector_impl.h b/gr-blocks/lib/selector_impl.h index 123acc8bd6..1cf63a6dde 100644 --- a/gr-blocks/lib/selector_impl.h +++ b/gr-blocks/lib/selector_impl.h @@ -20,7 +20,7 @@ namespace blocks { class selector_impl : public selector { private: - size_t d_itemsize; + const size_t d_itemsize; bool d_enabled; unsigned int d_input_index, d_output_index; unsigned int d_num_inputs, d_num_outputs; // keep track of the topology diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index c81cc7a33c..c684ad013f 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -31,7 +31,7 @@ private: std::vector<tcp_connection::sptr> d_tcp_connections; void handle_tcp_read(const boost::system::error_code& error, size_t bytes_transferred); - bool d_tcp_no_delay; + const bool d_tcp_no_delay; // TCP server specific boost::shared_ptr<boost::asio::ip::tcp::acceptor> d_acceptor_tcp; diff --git a/gr-blocks/lib/stream_mux_impl.h b/gr-blocks/lib/stream_mux_impl.h index 1fa137ee9d..1ff03bdb20 100644 --- a/gr-blocks/lib/stream_mux_impl.h +++ b/gr-blocks/lib/stream_mux_impl.h @@ -19,10 +19,10 @@ namespace blocks { class BLOCKS_API stream_mux_impl : public stream_mux { private: - size_t d_itemsize; - unsigned int d_stream; // index of currently selected stream - int d_residual; // number if items left to put into current stream - gr_vector_int d_lengths; // number if items to pack per stream + const size_t d_itemsize; + unsigned int d_stream; // index of currently selected stream + int d_residual; // number if items left to put into current stream + const gr_vector_int d_lengths; // number if items to pack per stream void forecast(int noutput_items, gr_vector_int& ninput_items_required); diff --git a/gr-blocks/lib/stream_to_tagged_stream_impl.h b/gr-blocks/lib/stream_to_tagged_stream_impl.h index 0841b6dc26..c7683b357c 100644 --- a/gr-blocks/lib/stream_to_tagged_stream_impl.h +++ b/gr-blocks/lib/stream_to_tagged_stream_impl.h @@ -19,10 +19,10 @@ namespace blocks { class stream_to_tagged_stream_impl : public stream_to_tagged_stream { private: - size_t d_itemsize; + const size_t d_itemsize; unsigned d_packet_len; pmt::pmt_t d_packet_len_pmt; - pmt::pmt_t d_len_tag_key; + const pmt::pmt_t d_len_tag_key; uint64_t d_next_tag_pos; public: diff --git a/gr-blocks/lib/tag_gate_impl.h b/gr-blocks/lib/tag_gate_impl.h index d46de7aa2e..ceaf2927f4 100644 --- a/gr-blocks/lib/tag_gate_impl.h +++ b/gr-blocks/lib/tag_gate_impl.h @@ -19,7 +19,7 @@ namespace blocks { class tag_gate_impl : public tag_gate { private: - size_t d_item_size; + const size_t d_item_size; bool d_propagate_tags; bool d_single_key_set; diff --git a/gr-blocks/lib/tag_share_impl.h b/gr-blocks/lib/tag_share_impl.h index df29e977a0..40ebe43c6b 100644 --- a/gr-blocks/lib/tag_share_impl.h +++ b/gr-blocks/lib/tag_share_impl.h @@ -19,7 +19,7 @@ namespace blocks { class tag_share_impl : public tag_share { private: - size_t d_sizeof_io_item; + const size_t d_sizeof_io_item; const size_t d_vlen; public: diff --git a/gr-blocks/lib/tagged_stream_align_impl.h b/gr-blocks/lib/tagged_stream_align_impl.h index a6d0e4bdce..167489955f 100644 --- a/gr-blocks/lib/tagged_stream_align_impl.h +++ b/gr-blocks/lib/tagged_stream_align_impl.h @@ -20,8 +20,8 @@ namespace blocks { class tagged_stream_align_impl : public tagged_stream_align { private: - size_t d_itemsize; - pmt::pmt_t d_lengthtag; + const size_t d_itemsize; + const pmt::pmt_t d_lengthtag; bool d_have_sync; public: diff --git a/gr-blocks/lib/tagged_stream_mux_impl.h b/gr-blocks/lib/tagged_stream_mux_impl.h index ba58d2ba6c..bd526b115c 100644 --- a/gr-blocks/lib/tagged_stream_mux_impl.h +++ b/gr-blocks/lib/tagged_stream_mux_impl.h @@ -20,8 +20,8 @@ namespace blocks { class tagged_stream_mux_impl : public tagged_stream_mux { private: - size_t d_itemsize; - unsigned int d_tag_preserve_head_pos; + const size_t d_itemsize; + const unsigned int d_tag_preserve_head_pos; protected: int calculate_output_stream_length(const gr_vector_int& ninput_items); diff --git a/gr-blocks/lib/tags_strobe_impl.h b/gr-blocks/lib/tags_strobe_impl.h index 02c9dd6641..bb761857db 100644 --- a/gr-blocks/lib/tags_strobe_impl.h +++ b/gr-blocks/lib/tags_strobe_impl.h @@ -19,7 +19,7 @@ namespace blocks { class BLOCKS_API tags_strobe_impl : public tags_strobe { private: - size_t d_itemsize; + const size_t d_itemsize; uint64_t d_nsamps; tag_t d_tag; uint64_t d_offset; diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h index edc445de5a..d9b996b069 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.h +++ b/gr-blocks/lib/tcp_server_sink_impl.h @@ -22,7 +22,7 @@ namespace blocks { class tcp_server_sink_impl : public tcp_server_sink { private: - size_t d_itemsize; + const size_t d_itemsize; boost::asio::io_service d_io_service; gr::thread::thread d_io_serv_thread; diff --git a/gr-blocks/lib/test_tag_variable_rate_ff_impl.h b/gr-blocks/lib/test_tag_variable_rate_ff_impl.h index 8a007b5224..9afae0bb86 100644 --- a/gr-blocks/lib/test_tag_variable_rate_ff_impl.h +++ b/gr-blocks/lib/test_tag_variable_rate_ff_impl.h @@ -19,8 +19,8 @@ namespace blocks { class test_tag_variable_rate_ff_impl : public test_tag_variable_rate_ff { protected: - bool d_update_once; - double d_update_step; + const bool d_update_once; + const double d_update_step; double d_accum; double d_rrate; uint64_t d_old_in, d_new_in, d_last_out; diff --git a/gr-blocks/lib/throttle_impl.h b/gr-blocks/lib/throttle_impl.h index 3e0c58fe87..e01c3e7241 100644 --- a/gr-blocks/lib/throttle_impl.h +++ b/gr-blocks/lib/throttle_impl.h @@ -21,11 +21,11 @@ class throttle_impl : public throttle { private: std::chrono::time_point<std::chrono::steady_clock> d_start; - size_t d_itemsize; + const size_t d_itemsize; uint64_t d_total_samples; double d_sample_rate; std::chrono::duration<double> d_sample_period; - bool d_ignore_tags; + const bool d_ignore_tags; public: throttle_impl(size_t itemsize, double samples_per_sec, bool ignore_tags = true); diff --git a/gr-blocks/lib/tsb_vector_sink_impl.h b/gr-blocks/lib/tsb_vector_sink_impl.h index eaae6510cc..a2380f0281 100644 --- a/gr-blocks/lib/tsb_vector_sink_impl.h +++ b/gr-blocks/lib/tsb_vector_sink_impl.h @@ -23,7 +23,7 @@ class tsb_vector_sink_impl : public tsb_vector_sink<T> private: std::vector<std::vector<T>> d_data; std::vector<tag_t> d_tags; - unsigned int d_vlen; + const unsigned int d_vlen; public: tsb_vector_sink_impl(unsigned int vlen, const std::string& tsb_key); diff --git a/gr-blocks/lib/tuntap_pdu_impl.h b/gr-blocks/lib/tuntap_pdu_impl.h index 02d601cd23..86149443f9 100644 --- a/gr-blocks/lib/tuntap_pdu_impl.h +++ b/gr-blocks/lib/tuntap_pdu_impl.h @@ -25,8 +25,8 @@ class tuntap_pdu_impl : public tuntap_pdu, public stream_pdu_base { #if (defined(linux) || defined(__linux) || defined(__linux__)) private: - std::string d_dev; - bool d_istunflag; + const std::string d_dev; + const bool d_istunflag; int tun_alloc(char* dev, int flags); int set_mtu(const char* dev, int MTU); diff --git a/gr-blocks/lib/udp_sink_impl.h b/gr-blocks/lib/udp_sink_impl.h index 65e725a55c..238abaca8d 100644 --- a/gr-blocks/lib/udp_sink_impl.h +++ b/gr-blocks/lib/udp_sink_impl.h @@ -20,10 +20,10 @@ namespace blocks { class udp_sink_impl : public udp_sink { private: - size_t d_itemsize; + const size_t d_itemsize; - int d_payload_size; // maximum transmission unit (packet length) - bool d_eof; // send zero-length packet on disconnect + const int d_payload_size; // maximum transmission unit (packet length) + const bool d_eof; // send zero-length packet on disconnect bool d_connected; // are we connected? gr::thread::mutex d_mutex; // protects d_socket and d_connected diff --git a/gr-blocks/lib/udp_source_impl.h b/gr-blocks/lib/udp_source_impl.h index d4d151b3df..36d4e2b199 100644 --- a/gr-blocks/lib/udp_source_impl.h +++ b/gr-blocks/lib/udp_source_impl.h @@ -22,9 +22,9 @@ namespace blocks { class udp_source_impl : public udp_source { private: - size_t d_itemsize; + const size_t d_itemsize; int d_payload_size; // maximum transmission unit (packet length) - bool d_eof; // look for an EOF signal + const bool d_eof; // look for an EOF signal bool d_connected; // are we connected? char* d_rxbuf; // get UDP buffer items char* d_residbuf; // hold buffer between calls diff --git a/gr-blocks/lib/vco_c_impl.h b/gr-blocks/lib/vco_c_impl.h index f2eab1621e..715cf6cad2 100644 --- a/gr-blocks/lib/vco_c_impl.h +++ b/gr-blocks/lib/vco_c_impl.h @@ -20,9 +20,9 @@ namespace blocks { class vco_c_impl : public vco_c { private: - double d_sampling_rate; - double d_sensitivity; - double d_amplitude; + const double d_sampling_rate; + const double d_sensitivity; + const double d_amplitude; double d_k; gr::fxpt_vco d_vco; diff --git a/gr-blocks/lib/vco_f_impl.h b/gr-blocks/lib/vco_f_impl.h index e6d727b128..11afe96919 100644 --- a/gr-blocks/lib/vco_f_impl.h +++ b/gr-blocks/lib/vco_f_impl.h @@ -20,9 +20,9 @@ namespace blocks { class vco_f_impl : public vco_f { private: - double d_sampling_rate; - double d_sensitivity; - double d_amplitude; + const double d_sampling_rate; + const double d_sensitivity; + const double d_amplitude; double d_k; gr::fxpt_vco d_vco; diff --git a/gr-blocks/lib/vector_insert_impl.h b/gr-blocks/lib/vector_insert_impl.h index 39b9264251..32e39684f9 100644 --- a/gr-blocks/lib/vector_insert_impl.h +++ b/gr-blocks/lib/vector_insert_impl.h @@ -23,7 +23,7 @@ class vector_insert_impl : public vector_insert<T> private: std::vector<T> d_data; int d_offset; - int d_periodicity; + const int d_periodicity; public: vector_insert_impl(const std::vector<T>& data, int periodicity, int offset); diff --git a/gr-blocks/lib/vector_map_impl.h b/gr-blocks/lib/vector_map_impl.h index 932eb0585a..6753e12a5d 100644 --- a/gr-blocks/lib/vector_map_impl.h +++ b/gr-blocks/lib/vector_map_impl.h @@ -20,8 +20,8 @@ namespace blocks { class vector_map_impl : public vector_map { private: - size_t d_item_size; - std::vector<size_t> d_in_vlens; + const size_t d_item_size; + const std::vector<size_t> d_in_vlens; std::vector<std::vector<std::vector<size_t>>> d_mapping; gr::thread::mutex d_mutex; // mutex to protect set/work access diff --git a/gr-blocks/lib/vector_sink_impl.h b/gr-blocks/lib/vector_sink_impl.h index 562fe5f357..bf327491ed 100644 --- a/gr-blocks/lib/vector_sink_impl.h +++ b/gr-blocks/lib/vector_sink_impl.h @@ -25,7 +25,7 @@ private: std::vector<T> d_data; std::vector<tag_t> d_tags; mutable gr::thread::mutex d_data_mutex; // protects internal data access. - unsigned int d_vlen; + const unsigned int d_vlen; public: vector_sink_impl(unsigned int vlen, const int reserve_items); diff --git a/gr-blocks/lib/vector_source_impl.h b/gr-blocks/lib/vector_source_impl.h index de03bba548..ba380c29e9 100644 --- a/gr-blocks/lib/vector_source_impl.h +++ b/gr-blocks/lib/vector_source_impl.h @@ -24,7 +24,7 @@ private: std::vector<T> d_data; bool d_repeat; unsigned int d_offset; - unsigned int d_vlen; + const unsigned int d_vlen; bool d_settags; std::vector<tag_t> d_tags; diff --git a/gr-blocks/lib/wavfile_sink_impl.h b/gr-blocks/lib/wavfile_sink_impl.h index 337c5377cc..2d1a76845a 100644 --- a/gr-blocks/lib/wavfile_sink_impl.h +++ b/gr-blocks/lib/wavfile_sink_impl.h @@ -20,7 +20,7 @@ class wavfile_sink_impl : public wavfile_sink { private: unsigned d_sample_rate; - int d_nchans; + const int d_nchans; unsigned d_sample_count; int d_bytes_per_sample; int d_bytes_per_sample_new; |