summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2006-10-24 22:03:38 +0000
committereb2006-10-24 22:03:38 +0000
commit359b70960f8e2d9c5288914fe6370b836d0a8167 (patch)
treebdff0af33f0898a200df38c83db2c254d5b3a361
parent4a03552c34d5d400afb29b8bf90b41f8c5b08464 (diff)
downloadgnuradio-359b70960f8e2d9c5288914fe6370b836d0a8167.tar.gz
gnuradio-359b70960f8e2d9c5288914fe6370b836d0a8167.tar.bz2
gnuradio-359b70960f8e2d9c5288914fe6370b836d0a8167.zip
made warnings go away
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3852 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--gnuradio-core/src/lib/general/gr_log2_const.h2
-rw-r--r--gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t2
-rw-r--r--gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t2
-rw-r--r--gnuradio-core/src/lib/general/gri_agc2_cc.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h
index eb73983eb..0c27bbcce 100644
--- a/gnuradio-core/src/lib/general/gr_log2_const.h
+++ b/gnuradio-core/src/lib/general/gr_log2_const.h
@@ -29,7 +29,7 @@
#include <assert.h>
-template<unsigned int k> static inline int gr_log2_const() { assert(0); }
+template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; }
template<> static inline int gr_log2_const<1>() { return 0; }
template<> static inline int gr_log2_const<2>() { return 1; }
diff --git a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
index 15e859026..388def8f9 100644
--- a/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
+++ b/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
@@ -87,7 +87,7 @@ int
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- unsigned int index_tmp;
+ unsigned int index_tmp = d_index;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
diff --git a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
index 25a6f295f..7db6037b3 100644
--- a/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
+++ b/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
@@ -78,7 +78,7 @@ int
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- unsigned int index_tmp;
+ unsigned int index_tmp = d_index;
assert (input_items.size() == output_items.size());
int nstreams = input_items.size();
diff --git a/gnuradio-core/src/lib/general/gri_agc2_cc.h b/gnuradio-core/src/lib/general/gri_agc2_cc.h
index a8ca699c5..14f42395b 100644
--- a/gnuradio-core/src/lib/general/gri_agc2_cc.h
+++ b/gnuradio-core/src/lib/general/gri_agc2_cc.h
@@ -81,8 +81,8 @@ class gri_agc2_cc {
}
protected:
- float _decay_rate; // decay rate for slow changing signals
float _attack_rate; // attack rate for fast changing signals
+ float _decay_rate; // decay rate for slow changing signals
float _reference; // reference value
float _gain; // current gain
float _max_gain; // max allowable gain