clean-up of Viterbi blocks: d_trace is not a private variable anymore but a local...

[debian/gnuradio] / gr-trellis / src / lib / trellis_viterbi_combined_i.i

diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_i.i b/gr-trellis/src/lib/trellis_viterbi_combined_i.i
index 05d68d580b64cd6bfdf44c7f37609e64e64b57ad..47bea54e23c61e3d3d9cb88bc4c165d80b7cf660 100644 (file)
--- a/gr-trellis/src/lib/trellis_viterbi_combined_i.i
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_i.i
@@ -26,11 +26,11 @@ GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_i);
 
 trellis_viterbi_combined_i_sptr trellis_make_viterbi_combined_i (
     const fsm &FSM,
-    int D,
-    const std::vector<float> &TABLE,
     int K,
     int S0,
     int SK,
+    int D,
+    const std::vector<float> &TABLE,
     trellis_metric_type_t TYPE);
 
 
@@ -39,20 +39,20 @@ class trellis_viterbi_combined_i : public gr_block
 private:
   trellis_viterbi_combined_i (
     const fsm &FSM,
-    int D,
-    const std::vector<float> &TABLE,
     int K,
     int S0,
     int SK,
+    int D,
+    const std::vector<float> &TABLE,
     trellis_metric_type_t TYPE);
 
 public:
     fsm FSM () const { return d_FSM; }
-    int D () const { return d_D; }
-    std::vector<float> TABLE () const { return d_TABLE; }
     int K () const { return d_K; }
     int S0 () const { return d_S0; }
     int SK () const { return d_SK; }
+    int D () const { return d_D; }
+    std::vector<float> TABLE () const { return d_TABLE; }
     trellis_metric_type_t TYPE () const { return d_TYPE; }
     //std::vector<short> trace () const { return d_trace; }
 };