diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gr-trellis/lib | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-trellis/lib')
| -rw-r--r-- | gr-trellis/lib/metrics_X_impl.h.t | 2 | ||||
| -rw-r--r-- | gr-trellis/lib/pccc_encoder_XX_impl.h.t | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gr-trellis/lib/metrics_X_impl.h.t b/gr-trellis/lib/metrics_X_impl.h.t index 0cd7f0ba5b..2b4481fdb1 100644 --- a/gr-trellis/lib/metrics_X_impl.h.t +++ b/gr-trellis/lib/metrics_X_impl.h.t @@ -42,7 +42,7 @@ namespace gr { @IMPL_NAME@(int O, int D, const std::vector<@I_TYPE@> &TABLE, digital::trellis_metric_type_t TYPE); ~@IMPL_NAME@(); - + int O() const { return d_O; } int D() const { return d_D; } digital::trellis_metric_type_t TYPE() const { return d_TYPE; } diff --git a/gr-trellis/lib/pccc_encoder_XX_impl.h.t b/gr-trellis/lib/pccc_encoder_XX_impl.h.t index f7d6967584..5561b716d3 100644 --- a/gr-trellis/lib/pccc_encoder_XX_impl.h.t +++ b/gr-trellis/lib/pccc_encoder_XX_impl.h.t @@ -41,13 +41,13 @@ namespace gr { int d_blocklength; std::vector<int> d_buffer; - public: + public: @IMPL_NAME@(const fsm &FSM1, int ST1, const fsm &FSM2, int ST2, const interleaver &INTERLEAVER, int blocklength); ~@IMPL_NAME@(); - + fsm FSM1() const { return d_FSM1; } int ST1() const { return d_ST1; } fsm FSM2() const { return d_FSM2; } |