[Commit-gnuradio] r3854 - gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general

[jcorgan]

Author: jcorgan
Date: 2006-10-24 19:27:16 -0600 (Tue, 24 Oct 2006)
New Revision: 3854

Modified:
   gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_log2_const.h
   
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
   
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
   gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gri_agc2_cc.h
Log:
Applied changeset r3852 on trunk to release branch.

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_log2_const.h
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_log2_const.h    
    2006-10-24 23:48:42 UTC (rev 3853)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_log2_const.h    
    2006-10-25 01:27:16 UTC (rev 3854)
@@ -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; }

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
  2006-10-24 23:48:42 UTC (rev 3853)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_packed_to_unpacked_XX.cc.t
  2006-10-25 01:27:16 UTC (rev 3854)
@@ -87,7 +87,7 @@
                                        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();

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
===================================================================
--- 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
  2006-10-24 23:48:42 UTC (rev 3853)
+++ 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gr_unpacked_to_packed_XX.cc.t
  2006-10-25 01:27:16 UTC (rev 3854)
@@ -78,7 +78,7 @@
                                        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();

Modified: 
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gri_agc2_cc.h
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gri_agc2_cc.h  
2006-10-24 23:48:42 UTC (rev 3853)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/gri_agc2_cc.h  
2006-10-25 01:27:16 UTC (rev 3854)
@@ -81,8 +81,8 @@
   }
   
  protected:
+  float _attack_rate;          // attack rate for fast changing signals
   float _decay_rate;           // decay rate for slow changing signals
-  float _attack_rate;          // attack rate for fast changing signals
   float        _reference;             // reference value
   float        _gain;                  // current gain
   float _max_gain;             // max allowable gain