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/core_algorithms.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'gr-trellis/src/lib/core_algorithms.h')
diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h
index f1e1fc9c22..4efcc91235 100644
--- a/gr-trellis/src/lib/core_algorithms.h
+++ b/gr-trellis/src/lib/core_algorithms.h
@@ -55,7 +55,7 @@ void viterbi_algorithm_combined(int I, int S, int O,
int S0,int SK,
int D,
const std::vector<Ti> &TABLE,
- trellis_metric_type_t TYPE,
+ gr::digital::trellis_metric_type_t TYPE,
const Ti *in, To *out
);
@@ -86,7 +86,7 @@ void siso_algorithm_combined(int I, int S, int O,
float (*p2mymin)(float,float),
int D,
const std::vector<T> &TABLE,
- trellis_metric_type_t TYPE,
+ gr::digital::trellis_metric_type_t TYPE,
const float *priori, const T *observations, float *post
);
@@ -108,7 +108,7 @@ void sccc_decoder_combined(
const interleaver &INTERLEAVER, int blocklength, int iterations,
float (*p2mymin)(float,float),
int D, const std::vector<Ti> &TABLE,
- trellis_metric_type_t METRIC_TYPE,
+ gr::digital::trellis_metric_type_t METRIC_TYPE,
float scaling,
const Ti *observations, To *data
);
@@ -129,7 +129,7 @@ void pccc_decoder_combined(
const interleaver &INTERLEAVER, int blocklength, int iterations,
float (*p2mymin)(float,float),
int D, const std::vector<Ti> &TABLE,
- trellis_metric_type_t METRIC_TYPE,
+ gr::digital::trellis_metric_type_t METRIC_TYPE,
float scaling,
const Ti *observations, To *data
);
--
cgit v1.2.3