From 98bfb7d801f71e0f9a60fb3982caaeaace4f5baf Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Wed, 6 Apr 2016 16:27:47 +0200 Subject: [PATCH] Removing more unused parameters warnings using the __attribute__((unused)) pre-compiler directive --- .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc | 9 ++------- .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc | 11 +++-------- .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc | 9 ++------- ...ileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 3 +-- .../galileo_pcps_8ms_acquisition_cc.cc | 3 +-- .../gnuradio_blocks/pcps_acquisition_cc.cc | 3 +-- .../pcps_acquisition_fine_doppler_cc.cc | 3 +-- .../gnuradio_blocks/pcps_acquisition_sc.cc | 3 +-- .../pcps_assisted_acquisition_cc.cc | 3 +-- .../pcps_cccwsr_acquisition_cc.cc | 3 +-- .../pcps_multithread_acquisition_cc.cc | 3 +-- .../pcps_opencl_acquisition_cc.cc | 3 +-- .../pcps_quicksync_acquisition_cc.cc | 3 +-- .../gnuradio_blocks/pcps_tong_acquisition_cc.cc | 3 +-- .../gnuradio_blocks/signal_generator_c.cc | 11 +++-------- .../galileo_e1b_telemetry_decoder_cc.cc | 7 ++----- .../galileo_e5a_telemetry_decoder_cc.cc | 16 +--------------- .../gps_l1_ca_telemetry_decoder_cc.cc | 8 ++------ .../gps_l2_m_telemetry_decoder_cc.cc | 13 +++++-------- .../sbas_l1_telemetry_decoder_cc.cc | 8 ++------ 20 files changed, 33 insertions(+), 92 deletions(-) diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc index 7ae114171..d5b04be9b 100644 --- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc @@ -135,8 +135,8 @@ bool galileo_e1_pvt_cc::pseudoranges_pairCompare_min(const std::pair& a, const st -int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) +int gps_l1_ca_pvt_cc::general_work (int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), + gr_vector_const_void_star &input_items, gr_vector_void_star &output_items __attribute__((unused))) { d_sample_counter++; @@ -381,7 +381,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_ite d_dump_file.write((char*)&d_rx_time, sizeof(double)); } } - catch (std::ifstream::failure e) + catch (const std::ifstream::failure & e) { LOG(WARNING) << "Exception writing observables dump file " << e.what(); } @@ -389,11 +389,6 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_ite } consume_each(1); //one by one - output_items.clear(); // removes a warning - if((noutput_items == 0) || (ninput_items[0] == 0)) - { - LOG(WARNING) << "noutput_items = 0"; - } return 1; } diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc index 044c9689e..63bd24e26 100644 --- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc +++ b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc @@ -138,8 +138,8 @@ bool hybrid_pvt_cc::pseudoranges_pairCompare_min(const std::pair queue, + boost::shared_ptr queue __attribute__((unused)), bool dump) : gr::block("gps_l2_m_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), @@ -110,7 +110,7 @@ void gps_l2_m_telemetry_decoder_cc::set_decimation(int decimation) } -int gps_l2_m_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int &ninput_items, +int gps_l2_m_telemetry_decoder_cc::general_work (int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { // get pointers on in- and output gnss-synchro objects @@ -118,7 +118,7 @@ int gps_l2_m_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_in Gnss_Synchro *out = (Gnss_Synchro *) output_items[0]; // output // store the time stamp of the first sample in the processed sample block - double sample_stamp = in[0].Tracking_timestamp_secs; + //double sample_stamp = in[0].Tracking_timestamp_secs; bool flag_new_cnav_frame = false; int last_frame_preamble_start = 0; @@ -152,7 +152,8 @@ int gps_l2_m_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_in // and obtain the bits by decoding the symbols (viterbi decoder) // they can be already aligned or shifted by one position std::vector bits; - bool symbol_alignment = d_symbol_aligner_and_decoder.get_bits(d_sample_buf, bits); + + //bool symbol_alignment = d_symbol_aligner_and_decoder.get_bits(d_sample_buf, bits); //std::stringstream ss; //for (std::vector::const_iterator bit_it = bits.begin(); bit_it < bits.end(); ++bit_it) @@ -260,10 +261,6 @@ int gps_l2_m_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_in } d_average_count++; - if((noutput_items == 0) || (ninput_items[0] == 0)) - { - LOG(WARNING) << "noutput_items = 0"; - } if (d_average_count == d_decimation_output_factor) { d_average_count = 0; diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc index 026167790..b7c772888 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc @@ -57,7 +57,7 @@ sbas_l1_make_telemetry_decoder_cc(Gnss_Satellite satellite, boost::shared_ptr queue, + boost::shared_ptr queue __attribute__((unused)), bool dump) : gr::block("sbas_l1_telemetry_decoder_cc", gr::io_signature::make(1, 1, sizeof(Gnss_Synchro)), @@ -93,7 +93,7 @@ void sbas_l1_telemetry_decoder_cc::forecast (int noutput_items, gr_vector_int &n -int sbas_l1_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int &ninput_items, +int sbas_l1_telemetry_decoder_cc::general_work (int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { VLOG(FLOW) << "general_work(): " << "noutput_items=" << noutput_items << "\toutput_items real size=" << output_items.size() << "\tninput_items size=" << ninput_items.size() << "\tinput_items real size=" << input_items.size() << "\tninput_items[0]=" << ninput_items[0]; @@ -182,10 +182,6 @@ int sbas_l1_telemetry_decoder_cc::general_work (int noutput_items, gr_vector_int current_synchro_data[i].Flag_valid_word = false; // indicate to observable block that this synchro object isn't valid for pseudorange computation } consume_each(noutput_items); // tell scheduler input items consumed - if((noutput_items == 0) || (ninput_items[0] == 0)) - { - LOG(WARNING) << "noutput_items = 0"; - } return noutput_items; // tell scheduler output items produced }