From 372c129f932236fb0bacb83a8c8994171eb4d018 Mon Sep 17 00:00:00 2001 From: Tom Rondeau <trondeau@vt.edu> Date: Mon, 20 Aug 2012 21:08:24 -0400 Subject: trellis: updating gr-trellis to handle changes with gr-digital. (mostly namespace issues in C++). --- gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t') diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t index 633ded7707..2687a2056d 100644 --- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t +++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.i.t @@ -31,7 +31,7 @@ GR_SWIG_BLOCK_MAGIC(trellis,@BASE_NAME@); int SK, int D, const std::vector<@I_TYPE@> &TABLE, - trellis_metric_type_t TYPE); + gr::digital::trellis_metric_type_t TYPE); class @NAME@ : public gr_block @@ -44,7 +44,7 @@ private: int SK, int D, const std::vector<@I_TYPE@> &TABLE, - trellis_metric_type_t TYPE); + gr::digital::trellis_metric_type_t TYPE); public: fsm FSM () const { return d_FSM; } @@ -53,7 +53,7 @@ public: int SK () const { return d_SK; } int D () const { return d_D; } std::vector<@I_TYPE@> TABLE () const { return d_TABLE; } - trellis_metric_type_t TYPE () const { return d_TYPE; } + gr::digital::trellis_metric_type_t TYPE () const { return d_TYPE; } //std::vector<short> trace () const { return d_trace; } void set_TABLE (const std::vector<@I_TYPE@> &table); }; -- cgit v1.2.3