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.h.t | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t')
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
index c7e468e73b..f0a64c3317 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t
@@ -41,7 +41,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
int SK,
int D,
const std::vector<@I_TYPE@> &TABLE,
- trellis_metric_type_t TYPE);
+ gr::digital::trellis_metric_type_t TYPE);
/*!
@@ -55,7 +55,7 @@ class TRELLIS_API @NAME@ : public gr_block
int d_SK;
int d_D;
std::vector<@I_TYPE@> d_TABLE;
- trellis_metric_type_t d_TYPE;
+ gr::digital::trellis_metric_type_t d_TYPE;
//std::vector<int> d_trace;
friend TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (
@@ -65,7 +65,7 @@ class TRELLIS_API @NAME@ : public gr_block
int SK,
int D,
const std::vector<@I_TYPE@> &TABLE,
- trellis_metric_type_t TYPE);
+ gr::digital::trellis_metric_type_t TYPE);
@NAME@ (
@@ -75,7 +75,7 @@ class TRELLIS_API @NAME@ : public gr_block
int SK,
int D,
const std::vector<@I_TYPE@> &TABLE,
- trellis_metric_type_t TYPE);
+ gr::digital::trellis_metric_type_t TYPE);
public:
@@ -85,7 +85,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<int> trace () const { return d_trace; }
void set_TABLE (const std::vector<@I_TYPE@> &table);
void forecast (int noutput_items,
--
cgit v1.2.3