diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-06-26 15:42:23 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-06-26 15:42:23 -0400 |
| commit | 71a57cc76bd91202e7bd072134ab5f05959f9ed1 (patch) | |
| tree | fb73f0657d2ce2c0dd68234c14d960a47584f8b5 | |
| parent | 18262de17b8764d0f159eb517ff21cd6a7ee06a8 (diff) | |
build: removed some gcc warnings.
| -rw-r--r-- | gr-blocks/lib/unpack_k_bits.cc | 4 | ||||
| -rw-r--r-- | gr-filter/lib/filterbank_vcvcf_impl.cc | 10 | ||||
| -rw-r--r-- | volk/kernels/volk/volk_32f_binary_slicer_32i.h | 12 |
3 files changed, 10 insertions, 16 deletions
diff --git a/gr-blocks/lib/unpack_k_bits.cc b/gr-blocks/lib/unpack_k_bits.cc index a9ae4dae11..394c15ba84 100644 --- a/gr-blocks/lib/unpack_k_bits.cc +++ b/gr-blocks/lib/unpack_k_bits.cc @@ -50,7 +50,7 @@ namespace gr { int n = 0; for(int i = 0; i < nbytes; i++) { unsigned int t = bytes[i]; - for(int j = d_k - 1; j >= 0; j--) + for(unsigned int j = d_k - 1; j >= 0; j--) bits[n++] = (t >> j) & 0x01; } } @@ -61,7 +61,7 @@ namespace gr { int n = 0; for(int i = 0; i < nbytes; i++) { unsigned int t = bytes[i]; - for(int j = 0; j < d_k; j++) + for(unsigned int j = 0; j < d_k; j++) bits[n++] = (t >> j) & 0x01; } } diff --git a/gr-filter/lib/filterbank_vcvcf_impl.cc b/gr-filter/lib/filterbank_vcvcf_impl.cc index 93c26bbdb8..96fe13c250 100644 --- a/gr-filter/lib/filterbank_vcvcf_impl.cc +++ b/gr-filter/lib/filterbank_vcvcf_impl.cc @@ -31,13 +31,13 @@ namespace gr { namespace filter { - + filterbank_vcvcf::sptr filterbank_vcvcf::make(const std::vector<std::vector<float> > &taps) { return gnuradio::get_initial_sptr(new filterbank_vcvcf_impl(taps)); } - + filterbank_vcvcf_impl::filterbank_vcvcf_impl( const std::vector< std::vector<float> > &taps) : block("filterbank_vcvcf", @@ -90,10 +90,8 @@ namespace gr { return 0; // history requirements may have changed. } - size_t noutputs = output_items.size(); - gr_complex *working; - + working = new gr_complex [noutput_items + d_ntaps]; for (unsigned int i = 0; i < d_nfilts; i++) { @@ -115,7 +113,7 @@ namespace gr { } } } - + delete [] working; consume_each(noutput_items); return noutput_items; diff --git a/volk/kernels/volk/volk_32f_binary_slicer_32i.h b/volk/kernels/volk/volk_32f_binary_slicer_32i.h index 68bf2d534f..911df85ba4 100644 --- a/volk/kernels/volk/volk_32f_binary_slicer_32i.h +++ b/volk/kernels/volk/volk_32f_binary_slicer_32i.h @@ -58,9 +58,8 @@ static inline void volk_32f_binary_slicer_32i_a_sse2(int* cVector, const float* const float* aPtr = aVector; unsigned int number = 0; - float binary_float_buffer[4]; unsigned int quarter_points = num_points / 4; - __m128 a_val, res_f, binary_f; + __m128 a_val, res_f; __m128i res_i, binary_i; __m128 zero_val; zero_val = _mm_set1_ps (0.0f); @@ -105,10 +104,9 @@ static inline void volk_32f_binary_slicer_32i_a_avx(int* cVector, const float* a const float* aPtr = aVector; unsigned int number = 0; - float binary_float_buffer[4]; unsigned int quarter_points = num_points / 8; __m256 a_val, res_f, binary_f; - __m256i res_i, binary_i; + __m256i binary_i; __m256 zero_val, one_val; zero_val = _mm256_set1_ps (0.0f); one_val = _mm256_set1_ps (1.0f); @@ -154,9 +152,8 @@ static inline void volk_32f_binary_slicer_32i_u_sse2(int* cVector, const float* const float* aPtr = aVector; unsigned int number = 0; - float binary_float_buffer[4]; unsigned int quarter_points = num_points / 4; - __m128 a_val, res_f, binary_f; + __m128 a_val, res_f; __m128i res_i, binary_i; __m128 zero_val; zero_val = _mm_set1_ps (0.0f); @@ -201,10 +198,9 @@ static inline void volk_32f_binary_slicer_32i_u_avx(int* cVector, const float* a const float* aPtr = aVector; unsigned int number = 0; - float binary_float_buffer[4]; unsigned int quarter_points = num_points / 8; __m256 a_val, res_f, binary_f; - __m256i res_i, binary_i; + __m256i binary_i; __m256 zero_val, one_val; zero_val = _mm256_set1_ps (0.0f); one_val = _mm256_set1_ps (1.0f); |