diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-14 19:39:08 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-14 19:39:08 -0400 |
| commit | 29a019d2761f8001f2c132968c67b060a0ba24bc (patch) | |
| tree | 1e532c72134af3070ff6f7b4e6df62645bd17a8b /gr-digital | |
| parent | ab479e3d5b5d77eb4133dd06ea3ffc51551fccd6 (diff) | |
digital: moved metric_type.h to digital include dir. Fixed gr-trellis to work with this.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/include/digital/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital/constellation.h | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital/metric_type.h (renamed from gr-digital/include/digital_metric_type.h) | 2 | ||||
| -rw-r--r-- | gr-digital/lib/constellation.cc | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt index 27e151e0a5..83d0dfc557 100644 --- a/gr-digital/include/digital/CMakeLists.txt +++ b/gr-digital/include/digital/CMakeLists.txt @@ -103,7 +103,7 @@ install(FILES # lms_dd_equalizer_cc.h # kurtotic_equalizer_cc.h map_bb.h -# metric_type.h + metric_type.h mpsk_receiver_cc.h mpsk_snr_est_cc.h # ofdm_cyclic_prefixer.h diff --git a/gr-digital/include/digital/constellation.h b/gr-digital/include/digital/constellation.h index 0e38355561..1acc6bdc8b 100644 --- a/gr-digital/include/digital/constellation.h +++ b/gr-digital/include/digital/constellation.h @@ -24,7 +24,7 @@ #define INCLUDED_DIGITAL_CONSTELLATION_H #include <digital/api.h> -#include <digital_metric_type.h> +#include <digital/metric_type.h> #include <boost/enable_shared_from_this.hpp> #include <gr_complex.h> #include <vector> diff --git a/gr-digital/include/digital_metric_type.h b/gr-digital/include/digital/metric_type.h index 83de166f09..7eacc95150 100644 --- a/gr-digital/include/digital_metric_type.h +++ b/gr-digital/include/digital/metric_type.h @@ -27,5 +27,5 @@ typedef enum { TRELLIS_EUCLIDEAN = 200, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT } trellis_metric_type_t; -#endif +#endif /* INCLUDED_DIGITAL_METRIC_TYPE_H */ diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc index 6ff44dd39d..21008218b9 100644 --- a/gr-digital/lib/constellation.cc +++ b/gr-digital/lib/constellation.cc @@ -26,7 +26,6 @@ #include <gr_io_signature.h> #include <digital/constellation.h> -#include <digital_metric_type.h> #include <gr_math.h> #include <gr_complex.h> #include <math.h> |