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/cma_equalizer_cc_impl.cc | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-digital/lib/cma_equalizer_cc_impl.cc')
| -rw-r--r-- | gr-digital/lib/cma_equalizer_cc_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gr-digital/lib/cma_equalizer_cc_impl.cc b/gr-digital/lib/cma_equalizer_cc_impl.cc index e4e6c56466..6f11e617bb 100644 --- a/gr-digital/lib/cma_equalizer_cc_impl.cc +++ b/gr-digital/lib/cma_equalizer_cc_impl.cc @@ -25,7 +25,7 @@ #endif #include "cma_equalizer_cc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> namespace gr { namespace digital { @@ -41,9 +41,9 @@ namespace gr { cma_equalizer_cc_impl::cma_equalizer_cc_impl(int num_taps, float modulus, float mu, int sps) - : gr_sync_decimator("cma_equalizer_cc", - gr_make_io_signature(1, 1, sizeof(gr_complex)), - gr_make_io_signature(1, 1, sizeof(gr_complex)), + : sync_decimator("cma_equalizer_cc", + io_signature::make(1, 1, sizeof(gr_complex)), + io_signature::make(1, 1, sizeof(gr_complex)), sps), fir_filter_ccc(sps, std::vector<gr_complex>(num_taps, gr_complex(0,0))), d_new_taps(num_taps, gr_complex(0,0)), @@ -79,8 +79,8 @@ namespace gr { cma_equalizer_cc_impl::error(const gr_complex &out) { gr_complex error = out*(norm(out) - d_modulus); - float re = gr_clip(error.real(), 1.0); - float im = gr_clip(error.imag(), 1.0); + float re = gr::clip(error.real(), 1.0); + float im = gr::clip(error.imag(), 1.0); return gr_complex(re, im); } |