Fix for ticket:29 . Newly generated .cc,.h,.i files are also checked

in, with the "warning" message at the top.



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

21 files changed, 159 insertions, 295 deletions

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 466ab6bb7..0648c2618 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-include Makefile.gen
-
 # Install this stuff so that it ends up as the gnuradio.trellis module
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
@@ -34,28 +32,60 @@ INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
 
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
-
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)			
-
+# ----------------------------------------------------------------
+# these scripts generate trellis codes from template files
+
+CODE_GENERATOR = 				\
+	generate_all.py				\
+	generate_trellis.py			\
+	trellis_encoder_XX.cc.t			\
+	trellis_encoder_XX.h.t			\
+	trellis_encoder_XX.i.t			\
+	trellis_metrics_X.cc.t			\
+	trellis_metrics_X.h.t			\
+	trellis_metrics_X.i.t			\
+	trellis_viterbi_combined_X.cc.t		\
+	trellis_viterbi_combined_X.h.t		\
+	trellis_viterbi_combined_X.i.t		\
+	trellis_viterbi_X.cc.t			\
+	trellis_viterbi_X.h.t			\
+	trellis_viterbi_X.i.t
 
-LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-trellis/src/lib/trellis.i			
+include Makefile.gen
 
+$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
+	PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python \
+		srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _trellis shared library
 # and knows how to call our extensions.
 
-BUILT_SOURCES = 			\
-	trellis.cc			\
+SWIG_BUILT_SOURCES = 		\
+	trellis.cc		\
 	trellis.py				
 
+BUILT_SOURCES = \
+	$(GENERATED_H)		\
+	$(GENERATED_I)		\
+	$(GENERATED_CC)		\
+	$(SWIG_BUILT_SOURCES)
+
+ALL_IFILES = 			\
+	$(LOCAL_IFILES)		\
+	$(NON_LOCAL_IFILES)	
+
+NON_LOCAL_IFILES =		\
+	$(GNURADIO_I)	
+
+LOCAL_IFILES = 			\
+	$(top_srcdir)/gr-trellis/src/lib/trellis.i			
+
+EXTRA_DIST = 			\
+	$(CODE_GENERATOR)
+
 # This gets trellis.py installed in the right place
-ourpython_PYTHON =			\
+ourpython_PYTHON =		\
 	trellis.py
 
 ourlib_LTLIBRARIES = _trellis.la
@@ -81,7 +111,7 @@ _trellis_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 _trellis_la_LIBADD = 			\
 	$(PYTHON_LDFLAGS)		\
 	$(GNURADIO_CORE_LIBS)		\
-	-lstdc++			
+	-lstdc++
 
 trellis.cc trellis.py: $(ALL_IFILES) $(grinclude_HEADERS)
 	$(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
@@ -97,9 +127,8 @@ grinclude_HEADERS =			\
         trellis_permutation.h		\
         trellis_siso_type.h		\
 	trellis_siso_f.h		\
-	trellis_siso_combined_f.h		\
-	$(GENERATED_H)                  
-
+	trellis_siso_combined_f.h	\
+	$(GENERATED_H)
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS = 			\
@@ -112,11 +141,9 @@ swiginclude_HEADERS = 			\
 	trellis_siso_combined_f.i	\
 	trellis_generated.i
 
-
-
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+CLEANFILES = $(BUILT_SOURCES) *.pyc
 
 # Don't distribute output of swig
 dist-hook:
-	@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
-	@for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+	@for file in $(SWIG_BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
+	@for file in $(SWIG_BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
diff --git a/gr-trellis/src/lib/build_utils.py b/gr-trellis/src/lib/build_utils.py
deleted file mode 100644
index 9145e868c..000000000
--- a/gr-trellis/src/lib/build_utils.py
+++ /dev/null
@@ -1,193 +0,0 @@
-#
-# Copyright 2004 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-"""Misc utilities used at build time
-"""
-
-import re, os, os.path
-from build_utils_codes import *
-
-
-# set srcdir to the directory that contains Makefile.am
-try:
-    srcdir = os.environ['srcdir']
-except KeyError, e:
-    srcdir = "."
-srcdir = srcdir + '/'
-
-
-name_dict = {}
-
-def log_output_name (name):
-    (base, ext) = os.path.splitext (name)
-    ext = ext[1:]                       # drop the leading '.'
-    
-    entry = name_dict.setdefault (ext, [])
-    entry.append (name)
-    
-def open_and_log_name (name, dir):
-    f = open (name, dir)
-    log_output_name (name)
-    return f
-
-def expand_template (d, template_filename, extra = ""):
-    '''Given a dictionary D and a TEMPLATE_FILENAME, expand template into output file
-    '''
-    output_extension = extract_extension (template_filename)
-    template = open_src (template_filename, 'r')
-    output_name = d['NAME'] + extra + '.' + output_extension
-    log_output_name (output_name)
-    output = open (output_name, 'w')
-    do_substitution (d, template, output)
-    template.close ()
-    output.close ()
-
-def output_glue (dirname):
-    output_makefile_fragment ()
-    output_ifile_include (dirname)
-    
-def output_makefile_fragment ():
-    f = open ('Makefile.gen', 'w')
-    f.write ('#\n# This file is machine generated.  All edits will be overwritten\n#\n')
-    output_subfrag (f, 'h')
-    output_subfrag (f, 'i')
-    output_subfrag (f, 'cc')
-    f.close ()
-
-def output_ifile_include (dirname):
-    f = open ('%s_generated.i' % (dirname,), 'w')
-    f.write ('//\n// This file is machine generated.  All edits will be overwritten\n//\n')
-    files = name_dict.setdefault ('i', [])
-    files.sort ()
-    f.write ('%{\n')
-    for file in files:
-        f.write ('#include <%s>\n' % (file[0:-1] + 'h',))
-    f.write ('%}\n\n')
-    for file in files:
-        f.write ('%%include <%s>\n' % (file,))
-
-def output_subfrag (f, ext):
-    files = name_dict.setdefault (ext, [])
-    files.sort ()
-    f.write ("GENERATED_%s =" % (ext.upper ()))
-    for file in files:
-        f.write (" \\\n\t%s" % (file,))
-    f.write ("\n\n")
-    
-
-def extract_extension (template_name):
-    # template name is something like: GrFIRfilterXXX.h.t
-    # we return everything between the penultimate . and .t
-    mo = re.search (r'\.([a-z]+)\.t$', template_name)
-    if not mo:
-        raise ValueError, "Incorrectly formed template_name '%s'" % (template_name,)
-    return mo.group (1)
-
-def open_src (name, mode):
-    global srcdir
-    return open (os.path.join (srcdir, name), mode)
-
-def do_substitution (d, in_file, out_file):
-    def repl (match_obj):
-        key = match_obj.group (1)
-        # print key
-        return d[key]
-    
-    inp = in_file.read ()
-    out = re.sub (r"@([a-zA-Z0-9_]+)@", repl, inp)
-    out_file.write (out)
-
-    
-
-copyright = '''/* -*- c++ -*- */
-/*
- * Copyright 2003,2004 Free Software Foundation, Inc.
- * 
- * This file is part of GNU Radio
- * 
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- * 
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-'''
-
-def is_byte (code3):
-    if i_code (code3) == 'b' or o_code (code3) == 'b':
-        return '1'
-    else:
-        return '0'
-
-def is_short (code3):
-    if i_code (code3) == 's' or o_code (code3) == 's':
-        return '1'
-    else:
-        return '0'
-
-def is_int (code3):
-    if i_code (code3) == 'i' or o_code (code3) == 'i':
-        return '1'
-    else:
-        return '0'
-
-def is_float (code3):
-    if i_code (code3) == 'f' or o_code (code3) == 'f':
-        return '1'
-    else:
-        return '0'
-
-def is_complex (code3):
-    if i_code (code3) == 'c' or o_code (code3) == 'c':
-        return '1'
-    else:
-        return '0'
-
-
-
-
-def standard_dict (name, code3):
-    d = {}
-    d['NAME'] = name
-    d['GUARD_NAME'] = 'INCLUDED_%s_H' % name.upper ()
-    d['BASE_NAME'] = re.sub ('^trellis_', '', name)
-    d['SPTR_NAME'] = '%s_sptr' % name
-    d['WARNING'] = 'WARNING: this file is machine generated.  Edits will be over written'
-    d['COPYRIGHT'] = copyright
-    d['TYPE'] = i_type (code3)
-    d['I_TYPE'] = i_type (code3)
-    d['O_TYPE'] = o_type (code3)
-    d['TAP_TYPE'] = tap_type (code3)
-    d['IS_BYTE'] = is_byte (code3)
-    d['IS_SHORT'] = is_short (code3)
-    d['IS_INT'] = is_int (code3)
-    d['IS_FLOAT'] = is_float (code3)
-    d['IS_COMPLEX'] = is_complex (code3)
-    return d
diff --git a/gr-trellis/src/lib/build_utils_codes.py b/gr-trellis/src/lib/build_utils_codes.py
deleted file mode 100644
index aa2e7f305..000000000
--- a/gr-trellis/src/lib/build_utils_codes.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# Copyright 2004 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-# 
-
-def i_code (code3):
-    return code3[0]
-
-def o_code (code3):
-    if len (code3) >= 2:
-        return code3[1]
-    else:
-        return code3[0]
-
-def tap_code (code3):
-    if len (code3) >= 3:
-        return code3[2]
-    else:
-        return code3[0]
-
-def i_type (code3):
-    return char_to_type[i_code (code3)]
-
-def o_type (code3):
-    return char_to_type[o_code (code3)]
-
-def tap_type (code3):
-    return char_to_type[tap_code (code3)]
-
-
-char_to_type = {}
-char_to_type['s'] = 'short'
-char_to_type['i'] = 'int'
-char_to_type['f'] = 'float'
-char_to_type['c'] = 'gr_complex'
-char_to_type['b'] = 'unsigned char'
diff --git a/gr-trellis/src/lib/generate_all.py b/gr-trellis/src/lib/generate_all.py
index e41123b13..eda86ff76 100644
--- a/gr-trellis/src/lib/generate_all.py
+++ b/gr-trellis/src/lib/generate_all.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -22,12 +22,11 @@
 
 from build_utils import output_glue
 
-import generate_common
+import generate_trellis
 
 def generate_all ():
-    generate_common.generate ()
+    generate_trellis.generate ()
     output_glue ('trellis')
 
-
 if __name__ == '__main__':
     generate_all ()
diff --git a/gr-trellis/src/lib/generate_common.py b/gr-trellis/src/lib/generate_trellis.py
index e09a0d22b..e23ec4ad7 100644
--- a/gr-trellis/src/lib/generate_common.py
+++ b/gr-trellis/src/lib/generate_trellis.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,19 +20,19 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from build_utils import expand_template, standard_dict
+from build_utils import expand_template, copyright, open_and_log_name
 from build_utils_codes import *
-
 import re
 
-
 # regular blocks
+
 other_roots = [
     'trellis_encoder_XX',
     'trellis_metrics_X',
     'trellis_viterbi_X',
     'trellis_viterbi_combined_X',
     ]
+
 other_signatures = (
     ['bb','bs','bi','ss','si','ii'],
     ['s','i','f','c'],
@@ -41,6 +41,60 @@ other_signatures = (
     )
 
 
+def is_byte (code3):
+    if i_code (code3) == 'b' or o_code (code3) == 'b':
+        return '1'
+    else:
+        return '0'
+
+
+def is_short (code3):
+    if i_code (code3) == 's' or o_code (code3) == 's':
+        return '1'
+    else:
+        return '0'
+
+
+def is_int (code3):
+    if i_code (code3) == 'i' or o_code (code3) == 'i':
+        return '1'
+    else:
+        return '0'
+
+
+def is_float (code3):
+    if i_code (code3) == 'f' or o_code (code3) == 'f':
+        return '1'
+    else:
+        return '0'
+
+
+def is_complex (code3):
+    if i_code (code3) == 'c' or o_code (code3) == 'c':
+        return '1'
+    else:
+        return '0'
+
+
+def standard_dict (name, code3):
+    d = {}
+    d['NAME'] = name
+    d['GUARD_NAME'] = 'INCLUDED_%s_H' % name.upper ()
+    d['BASE_NAME'] = re.sub ('^trellis_', '', name)
+    d['SPTR_NAME'] = '%s_sptr' % name
+    d['WARNING'] = 'WARNING: this file is machine generated.  Edits will be over written'
+    d['COPYRIGHT'] = copyright
+    d['TYPE'] = i_type (code3)
+    d['I_TYPE'] = i_type (code3)
+    d['O_TYPE'] = o_type (code3)
+    d['TAP_TYPE'] = tap_type (code3)
+    d['IS_BYTE'] = is_byte (code3)
+    d['IS_SHORT'] = is_short (code3)
+    d['IS_INT'] = is_int (code3)
+    d['IS_FLOAT'] = is_float (code3)
+    d['IS_COMPLEX'] = is_complex (code3)
+    return d
+
 
 def expand_h_cc_i (root, sig):
     # root looks like 'gr_vector_sink_X'
@@ -57,10 +111,7 @@ def generate ():
         for s in other_signatures[i]:
             expand_h_cc_i (r, s)
         i=i+1
-            
 
 
 if __name__ == '__main__':
     generate ()
-
-    
diff --git a/gr-trellis/src/lib/trellis_encoder_bb.cc b/gr-trellis/src/lib/trellis_encoder_bb.cc
index 6740f3ac5..bbb3c905f 100644
--- a/gr-trellis/src/lib/trellis_encoder_bb.cc
+++ b/gr-trellis/src/lib/trellis_encoder_bb.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_bb::work (int noutput_items,
 			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_encoder_bi.cc b/gr-trellis/src/lib/trellis_encoder_bi.cc
index 62a3be74a..5e3d1899b 100644
--- a/gr-trellis/src/lib/trellis_encoder_bi.cc
+++ b/gr-trellis/src/lib/trellis_encoder_bi.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_bi::work (int noutput_items,
 			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_encoder_bs.cc b/gr-trellis/src/lib/trellis_encoder_bs.cc
index 7a2c233b1..0d84ca904 100644
--- a/gr-trellis/src/lib/trellis_encoder_bs.cc
+++ b/gr-trellis/src/lib/trellis_encoder_bs.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_bs::work (int noutput_items,
 			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_encoder_ii.cc b/gr-trellis/src/lib/trellis_encoder_ii.cc
index 7b58a9b98..e281763a1 100644
--- a/gr-trellis/src/lib/trellis_encoder_ii.cc
+++ b/gr-trellis/src/lib/trellis_encoder_ii.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_ii::work (int noutput_items,
 			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_encoder_si.cc b/gr-trellis/src/lib/trellis_encoder_si.cc
index 69840d519..03da34fa1 100644
--- a/gr-trellis/src/lib/trellis_encoder_si.cc
+++ b/gr-trellis/src/lib/trellis_encoder_si.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_si::work (int noutput_items,
 			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_encoder_ss.cc b/gr-trellis/src/lib/trellis_encoder_ss.cc
index 7074c54c9..e4196eb99 100644
--- a/gr-trellis/src/lib/trellis_encoder_ss.cc
+++ b/gr-trellis/src/lib/trellis_encoder_ss.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -50,7 +52,7 @@ trellis_encoder_ss::work (int noutput_items,
 			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_metrics_c.cc b/gr-trellis/src/lib/trellis_metrics_c.cc
index 8a817513c..1dc3d137d 100644
--- a/gr-trellis/src/lib/trellis_metrics_c.cc
+++ b/gr-trellis/src/lib/trellis_metrics_c.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifndef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gr-trellis/src/lib/trellis_metrics_f.cc b/gr-trellis/src/lib/trellis_metrics_f.cc
index d9c91b274..6cfbe3520 100644
--- a/gr-trellis/src/lib/trellis_metrics_f.cc
+++ b/gr-trellis/src/lib/trellis_metrics_f.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifndef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gr-trellis/src/lib/trellis_metrics_i.cc b/gr-trellis/src/lib/trellis_metrics_i.cc
index c2162e704..ab0938d22 100644
--- a/gr-trellis/src/lib/trellis_metrics_i.cc
+++ b/gr-trellis/src/lib/trellis_metrics_i.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifndef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gr-trellis/src/lib/trellis_metrics_s.cc b/gr-trellis/src/lib/trellis_metrics_s.cc
index 5229f74c3..dd989b8e5 100644
--- a/gr-trellis/src/lib/trellis_metrics_s.cc
+++ b/gr-trellis/src/lib/trellis_metrics_s.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifndef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/gr-trellis/src/lib/trellis_viterbi_b.cc b/gr-trellis/src/lib/trellis_viterbi_b.cc
index 01c75381c..b4144434a 100644
--- a/gr-trellis/src/lib/trellis_viterbi_b.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_b.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -106,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_b.cc b/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
index 62d877f6a..9860c7f86 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_b.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -119,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;
           }
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_i.cc b/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
index 37a035500..72b64e0d0 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_i.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -119,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;
           }
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_s.cc b/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
index c332dd0d5..9ee6bc420 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_s.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -119,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;
           }
diff --git a/gr-trellis/src/lib/trellis_viterbi_i.cc b/gr-trellis/src/lib/trellis_viterbi_i.cc
index f5d61173b..b39c68510 100644
--- a/gr-trellis/src/lib/trellis_viterbi_i.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_i.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -106,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_s.cc b/gr-trellis/src/lib/trellis_viterbi_s.cc
index ccdd11558..9ccbab28b 100644
--- a/gr-trellis/src/lib/trellis_viterbi_s.cc
+++ b/gr-trellis/src/lib/trellis_viterbi_s.cc
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// WARNING: this file is machine generated.  Edits will be over written
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -106,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;