diff options
Diffstat (limited to 'gr-trellis/src/lib/trellis_constellation_metrics_cf.h')
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h index df35f16d2..a34c335ec 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h @@ -24,13 +24,13 @@ #define INCLUDED_TRELLIS_CONSTELLATION_METRICS_CF_H #include <gr_block.h> -#include <gr_constellation.h> -#include <gr_metric_type.h> +#include <digital_constellation.h> +#include <digital_metric_type.h> class trellis_constellation_metrics_cf; typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr; -trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE); +trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); /*! * \brief Evaluate metrics for use by the Viterbi algorithm. @@ -46,14 +46,14 @@ class trellis_constellation_metrics_cf : public gr_block gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); protected: - trellis_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE); + trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); private: - gr_constellation_sptr d_constellation; + digital_constellation_sptr d_constellation; trellis_metric_type_t d_TYPE; unsigned int d_O; unsigned int d_D; - friend trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr_constellation_sptr constellation, trellis_metric_type_t TYPE); + friend trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); }; |