diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-digital/lib/constellation_receiver_cb_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-digital/lib/constellation_receiver_cb_impl.cc')
| -rw-r--r-- | gr-digital/lib/constellation_receiver_cb_impl.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc index 30be24aab9..cd44386ea0 100644 --- a/gr-digital/lib/constellation_receiver_cb_impl.cc +++ b/gr-digital/lib/constellation_receiver_cb_impl.cc @@ -25,10 +25,9 @@ #endif #include "constellation_receiver_cb_impl.h" -#include <gr_io_signature.h> -#include <gr_prefs.h> -#include <gr_math.h> -#include <gr_expj.h> +#include <gnuradio/io_signature.h> +#include <gnuradio/math.h> +#include <gnuradio/expj.h> #include <stdexcept> namespace gr { @@ -51,9 +50,9 @@ namespace gr { static std::vector<int> iosig(ios, ios+sizeof(ios)/sizeof(int)); constellation_receiver_cb_impl::constellation_receiver_cb_impl(constellation_sptr constellation, float loop_bw, float fmin, float fmax) - : gr_block("constellation_receiver_cb", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signaturev(1, 5, iosig)), + : block("constellation_receiver_cb", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::makev(1, 5, iosig)), blocks::control_loop(loop_bw, fmax, fmin), d_constellation(constellation), d_current_const_point(0) |