diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-digital/lib/mpsk_receiver_cc_impl.h | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-digital/lib/mpsk_receiver_cc_impl.h')
| -rw-r--r-- | gr-digital/lib/mpsk_receiver_cc_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-digital/lib/mpsk_receiver_cc_impl.h b/gr-digital/lib/mpsk_receiver_cc_impl.h index 3db6fa8b62..ed53d0f2e4 100644 --- a/gr-digital/lib/mpsk_receiver_cc_impl.h +++ b/gr-digital/lib/mpsk_receiver_cc_impl.h @@ -24,8 +24,8 @@ #define INCLUDED_DIGITAL_MPSK_RECEIVER_CC_IMPL_H #include <digital/mpsk_receiver_cc.h> -#include <gruel/attributes.h> -#include <gri_control_loop.h> +#include <attributes.h> +#include <blocks/control_loop.h> #include <gr_complex.h> #include <fstream> #include <filter/mmse_fir_interpolator_cc.h> @@ -34,7 +34,7 @@ namespace gr { namespace digital { class mpsk_receiver_cc_impl - : public mpsk_receiver_cc, public gri_control_loop + : public mpsk_receiver_cc, public blocks::control_loop { public: mpsk_receiver_cc_impl(unsigned int M, float theta, |