minor fixes so that there are no warnings when making gr-trellis

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4384 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-trellis/src/lib/trellis_encoder_XX.cc.t b/gr-trellis/src/lib/trellis_encoder_XX.cc.t
index efc55a4b75f699a91fe56e484c857e3c89e32182..30dd1208ed87807b3227c759f79e0d10f3226766 100644 (file)
--- a/gr-trellis/src/lib/trellis_encoder_XX.cc.t
+++ b/gr-trellis/src/lib/trellis_encoder_XX.cc.t
@@ -52,7 +52,7 @@ int
                        gr_vector_const_void_star &input_items,
                        gr_vector_void_star &output_items)
 {
-  int ST_tmp;
+  int ST_tmp=0;
 
   assert (input_items.size() == output_items.size());
   int nstreams = input_items.size();

diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.cc b/gr-trellis/src/lib/trellis_siso_combined_f.cc
index 293c42e15df055e2db7ed3ef2be9cfb02acc8627..e1ae3bcd46fe359d394792fb6c294b4474e860e4 100644 (file)
--- a/gr-trellis/src/lib/trellis_siso_combined_f.cc
+++ b/gr-trellis/src/lib/trellis_siso_combined_f.cc
@@ -171,8 +171,8 @@ void siso_algorithm_combined(int I, int S, int O,
       norm=INF;
       for(int j=0;j<S;j++) {
           minm=INF;
-          for(int i=0;i<PS[j].size();i++) {
-              int i0 = j*I+i;
+          for(unsigned int i=0;i<PS[j].size();i++) {
+              //int i0 = j*I+i;
               mm=alpha[k*S+PS[j][i]]+priori[k*I+PI[j][i]]+prioro[k*O+OS[PS[j][i]*I+PI[j][i]]];
               minm=(*p2mymin)(minm,mm);
           }

diff --git a/gr-trellis/src/lib/trellis_siso_f.cc b/gr-trellis/src/lib/trellis_siso_f.cc
index 9fe503eea47a37ecc5c474618e73a728e80ccbab..4d2fd971243152c4ec4f203968315ef097540db6 100644 (file)
--- a/gr-trellis/src/lib/trellis_siso_f.cc
+++ b/gr-trellis/src/lib/trellis_siso_f.cc
@@ -157,7 +157,7 @@ void siso_algorithm(int I, int S, int O,
       norm=INF;
       for(int j=0;j<S;j++) {
           minm=INF;
-          for(int i=0;i<PS[j].size();i++) {
+          for(unsigned int i=0;i<PS[j].size();i++) {
               //int i0 = j*I+i;
               mm=alpha[k*S+PS[j][i]]+priori[k*I+PI[j][i]]+prioro[k*O+OS[PS[j][i]*I+PI[j][i]]];
               minm=(*p2mymin)(minm,mm);

diff --git a/gr-trellis/src/lib/trellis_viterbi_X.cc.t b/gr-trellis/src/lib/trellis_viterbi_X.cc.t
index 4450609b668a72b1f923fa178e031b1c96fc467d..19a6680a43e8b59939aa4a66ba8399fa2989f113 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_X.cc.t
+++ b/gr-trellis/src/lib/trellis_viterbi_X.cc.t
@@ -108,7 +108,7 @@ void viterbi_algorithm(int I, int S, int O,
       for(int j=0;j<S;j++) { // for each next state do ACS
           minm=INF;
           minmi=0;
-          for(int i=0;i<PS[j].size();i++) {
+          for(unsigned int i=0;i<PS[j].size();i++) {
               //int i0 = j*I+i;
               if((mm=alpha[alphai*S+PS[j][i]]+in[k*O+OS[PS[j][i]*I+PI[j][i]]])<minm)
                   minm=mm,minmi=i;

diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
index 3fc51bf97377ad836628bcafecd381663500df52..b50fd83968c329d436c73a7393b9bbc50ca5b81f 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
@@ -121,8 +121,8 @@ void viterbi_algorithm_combined(int I, int S, int O,
       for(int j=0;j<S;j++) { // for each next state do ACS
           minm=INF;
           minmi=0;
-          for(int i=0;i<PS[j].size();i++) {
-              int i0 = j*I+i;
+          for(unsigned int i=0;i<PS[j].size();i++) {
+              //int i0 = j*I+i;
               if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm)
                   minm=mm,minmi=i;
           }