Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gr-trellis / src / lib / trellis_viterbi_s.h

diff --git a/gr-trellis/src/lib/trellis_viterbi_s.h b/gr-trellis/src/lib/trellis_viterbi_s.h
index 6232ce5bfe0b48aac8729a789476e79f73e7f5f8..1f2d3f150a0049bc7719dd5327779568e83d413f 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_s.h
+++ b/gr-trellis/src/lib/trellis_viterbi_s.h
@@ -6,7 +6,7 @@
  * 
  * 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)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -16,8 +16,8 @@
  * 
  * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
 // WARNING: this file is machine generated.  Edits will be over written
@@ -39,13 +39,16 @@ trellis_viterbi_s_sptr trellis_make_viterbi_s (
 
 
 
+/*!
+ *  \ingroup coding_blk
+ */
 class trellis_viterbi_s : public gr_block
 {
   fsm d_FSM;
   int d_K;
   int d_S0;
   int d_SK;
-  std::vector<int> d_trace;
+  //std::vector<int> d_trace;
 
   friend trellis_viterbi_s_sptr trellis_make_viterbi_s (
     const fsm &FSM,