[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 23/23: build: removed some gcc warnings.
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 23/23: build: removed some gcc warnings. |
Date: |
Thu, 26 Jun 2014 19:54:45 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 71a57cc76bd91202e7bd072134ab5f05959f9ed1
Author: Tom Rondeau <address@hidden>
Date: Thu Jun 26 15:42:23 2014 -0400
build: removed some gcc warnings.
---
gr-blocks/lib/unpack_k_bits.cc | 4 ++--
gr-filter/lib/filterbank_vcvcf_impl.cc | 10 ++++------
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 a9ae4da..394c15b 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 93c26bb..96fe13c 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 68bf2d5..911df85 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);
- [Commit-gnuradio] [gnuradio] 03/23: digital: expose set_constellation message port in GRC for constellation_receiver., (continued)
- [Commit-gnuradio] [gnuradio] 03/23: digital: expose set_constellation message port in GRC for constellation_receiver., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 08/23: qtgui: adds an alternative qss file., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 14/23: docs: adding docs for blocks::copy and digital::constellation_receiver to describe their message ports., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 15/23: qtgui: dynamically adjust min/max amplitude for qtgui freq and waterfall plots., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 16/23: Merge branch 'maint', git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 11/23: qtgui: for sink_x, waterfall_sink_x, and freq_sink_x, when the display is double-clicked, the center frequency is adjusted to the clicked frequency and a message is posted containing the new center frequency., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 17/23: replaced dynamic_ by static_cast; typechecking done before, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 02/23: cmake: Include GrBoost at the top level such that the correct default BOOST variables are set throughout the build. Because of the way CMake handles non-cached variables, each GR component (e.g., Volk) can change the BOOST variables for its particular needs without overriding these default values for other components., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 06/23: blocks.head: added callback to GRC definition, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 18/23: crc32_async: fix memory leak; coverity 1215946, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 23/23: build: removed some gcc warnings.,
git <=
- [Commit-gnuradio] [gnuradio] 21/23: Merge remote-tracking branch 'mmueller/blocks_grc_add_head_set_length_cb', git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 20/23: Merge remote-tracking branch 'michaelld/boost_once', git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 19/23: gr-fec: cc_decoder: fix leak; coverity 1215943, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 22/23: Merge branch 'maint', git, 2014/06/26