diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-04-10 15:18:30 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-04-10 15:18:30 -0400 |
| commit | ba7e4e940f156c24085fe3885e42ac8f035915fa (patch) | |
| tree | 56045ee9f255b551d542806f515f20f57ba2d811 | |
| parent | 63945231b6d6a5492723a739c10d22b583d02be3 (diff) | |
digital: fix for issue #664.
The mpsk_receiver_cc block needed to publicly inherit from control_loop.
| -rw-r--r-- | gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h | 5 | ||||
| -rw-r--r-- | gr-digital/lib/mpsk_receiver_cc_impl.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h index 8bc2bceb01..618d192771 100644 --- a/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h +++ b/gr-digital/include/gnuradio/digital/mpsk_receiver_cc.h @@ -25,6 +25,7 @@ #include <gnuradio/digital/api.h> #include <gnuradio/block.h> +#include <gnuradio/blocks/control_loop.h> namespace gr { namespace digital { @@ -65,7 +66,9 @@ namespace gr { * self-noise. * */ - class DIGITAL_API mpsk_receiver_cc : virtual public block + class DIGITAL_API mpsk_receiver_cc + : virtual public block, + virtual public blocks::control_loop { public: // gr::digital::mpsk_receiver_cc::sptr diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h index fc5cc777fd..48a9e43e58 100644 --- a/gr-digital/lib/mpsk_receiver_cc_impl.h +++ b/gr-digital/lib/mpsk_receiver_cc_impl.h @@ -25,7 +25,6 @@ #include <gnuradio/digital/mpsk_receiver_cc.h> #include <gnuradio/attributes.h> -#include <gnuradio/blocks/control_loop.h> #include <gnuradio/gr_complex.h> #include <fstream> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> @@ -33,8 +32,7 @@ namespace gr { namespace digital { - class mpsk_receiver_cc_impl - : public mpsk_receiver_cc, public blocks::control_loop + class mpsk_receiver_cc_impl : public mpsk_receiver_cc { public: mpsk_receiver_cc_impl(unsigned int M, float theta, |