mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-10 20:23:09 +00:00
Code Issues Releases Wiki Activity

Fix shadowed variables

Browse Source 
See MISRA C++:2008, 2-10-2 - Identifiers declared in an inner scope shall not hide an identifier declared in an outer scope
and https://rules.sonarsource.com/cpp/RSPEC-1117\?search\=shadow
This commit is contained in:
Carles Fernandez
2020-02-26 22:40:00 +01:00
parent 538c1e6182
commit c470d43432
18 changed files with 124 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.cc
View File

@@ -23,9 +23,9 @@
#include <gnuradio/io_signature.h>
#include <cmath>
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit)
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit_)
{
return unpack_spir_gss6450_samples_sptr(new unpack_spir_gss6450_samples(adc_nbit));
return unpack_spir_gss6450_samples_sptr(new unpack_spir_gss6450_samples(adc_nbit_));
}
@@ -38,12 +38,12 @@ unpack_spir_gss6450_samples::unpack_spir_gss6450_samples(unsigned int adc_nbit)
}
void unpack_spir_gss6450_samples::decode_4bits_word(uint32_t input_uint32, gr_complex* out, int adc_bits)
void unpack_spir_gss6450_samples::decode_4bits_word(uint32_t input_uint32, gr_complex* out, int adc_bits_)
{
int8_t tmp_char;
float Q;
float I;
switch (adc_bits)
switch (adc_bits_)
{
case 2:
// four bits per complex sample (2 I + 2 Q), 8 samples per int32[s0,s1,s2,s3,s4,s5,s6,s7]

4
src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
View File

@@ -27,7 +27,7 @@ class unpack_spir_gss6450_samples;
using unpack_spir_gss6450_samples_sptr = boost::shared_ptr<unpack_spir_gss6450_samples>;
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit);
unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit_);
class unpack_spir_gss6450_samples : public gr::sync_interpolator
@@ -36,7 +36,7 @@ public:
int work(int noutput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
friend unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples_sptr(unsigned int adc_nbit);
void decode_4bits_word(uint32_t input_uint32, gr_complex *out, int adc_bits);
void decode_4bits_word(uint32_t input_uint32, gr_complex *out, int adc_bits_);
explicit unpack_spir_gss6450_samples(unsigned int adc_nbit);
~unpack_spir_gss6450_samples() = default;