gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now that it is in gr-digital.

6 files changed, 4 insertions, 37 deletions

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 2f249f62f..e81490089 100644
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -82,7 +82,6 @@ grinclude_HEADERS =			\
         quicksort_index.h		\
         base.h				\
         interleaver.h			\
-        metric_type.h		\
         calc_metric.h		\
         core_algorithms.h		\
         trellis_permutation.h		\
diff --git a/gr-trellis/src/lib/calc_metric.h b/gr-trellis/src/lib/calc_metric.h
index d628f44e0..fd20f8d36 100644
--- a/gr-trellis/src/lib/calc_metric.h
+++ b/gr-trellis/src/lib/calc_metric.h
@@ -25,7 +25,7 @@
 
 #include <vector>
 #include <gr_complex.h>
-#include <metric_type.h>
+#include <digital_metric_type.h>
 
 
 template <class T> 
diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h
index fdb5f398e..fd45844c0 100644
--- a/gr-trellis/src/lib/core_algorithms.h
+++ b/gr-trellis/src/lib/core_algorithms.h
@@ -26,7 +26,7 @@
 #include <cmath>
 #include <vector>
 //#include <gr_complex.h>
-#include "metric_type.h"
+#include "digital_metric_type.h"
 #include "fsm.h"
 #include "interleaver.h"
 
diff --git a/gr-trellis/src/lib/metric_type.h b/gr-trellis/src/lib/metric_type.h
deleted file mode 100644
index a1040f108..000000000
--- a/gr-trellis/src/lib/metric_type.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- c++ -*- */
-/*
- * Copyright 2004 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio
- *
- * GNU Radio is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * GNU Radio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef INCLUDED_TRELLIS_METRIC_TYPE_H
-#define INCLUDED_TRELLIS_METRIC_TYPE_H
-
-typedef enum {
-  TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT
-} trellis_metric_type_t;
-
-#endif
-
diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i
index 84b77a286..a030ab906 100644
--- a/gr-trellis/src/lib/trellis.i
+++ b/gr-trellis/src/lib/trellis.i
@@ -41,14 +41,13 @@
 %include "trellis_siso_f.i"
 %include "trellis_siso_combined_f.i"
 
-%include "metric_type.h"
 %include "siso_type.h"
 
 %include "trellis_constellation_metrics_cf.i"
 
 %include "trellis_generated.i"
 
-%import "gr_metric_type.h"
+%import "digital_metric_type.h"
 %import "digital_constellation.i"
 
 %pythoncode %{
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
index 1a0eb72ee..a34c335ec 100644
--- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
+++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h
@@ -25,7 +25,7 @@
 
 #include <gr_block.h>
 #include <digital_constellation.h>
-#include <gr_metric_type.h>
+#include <digital_metric_type.h>
 
 class trellis_constellation_metrics_cf;
 typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr;