diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-wavelet/lib | |
| parent | 35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff) | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-wavelet/lib')
| -rw-r--r-- | gr-wavelet/lib/squash_ff_impl.cc | 8 | ||||
| -rw-r--r-- | gr-wavelet/lib/wavelet_ff_impl.cc | 8 | ||||
| -rw-r--r-- | gr-wavelet/lib/wvps_ff_impl.cc | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc index 081ac900f5..47f8c616d5 100644 --- a/gr-wavelet/lib/squash_ff_impl.cc +++ b/gr-wavelet/lib/squash_ff_impl.cc @@ -26,7 +26,7 @@ #include <stdexcept> #include <squash_ff_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> // expect input vector of igrid.size y-values, // produce output vector of ogrid.size y-values @@ -42,9 +42,9 @@ namespace gr { squash_ff_impl::squash_ff_impl(const std::vector<float> &igrid, const std::vector<float> &ogrid) - : gr_sync_block("squash_ff", - gr_make_io_signature(1, 1, sizeof(float) * igrid.size()), - gr_make_io_signature(1, 1, sizeof(float) * ogrid.size())) + : sync_block("squash_ff", + io_signature::make(1, 1, sizeof(float) * igrid.size()), + io_signature::make(1, 1, sizeof(float) * ogrid.size())) { d_inum = igrid.size(); d_onum = ogrid.size(); diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc index 73fc8c5440..6b313574b3 100644 --- a/gr-wavelet/lib/wavelet_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_ff_impl.cc @@ -26,7 +26,7 @@ #include <stdexcept> #include <wavelet_ff_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdio.h> @@ -46,9 +46,9 @@ namespace gr { wavelet_ff_impl::wavelet_ff_impl(int size, int order, bool forward) - : gr_sync_block("wavelet_ff", - gr_make_io_signature(1, 1, size * sizeof(float)), - gr_make_io_signature(1, 1, size * sizeof(float))), + : sync_block("wavelet_ff", + io_signature::make(1, 1, size * sizeof(float)), + io_signature::make(1, 1, size * sizeof(float))), d_size(size), d_order(order), d_forward(forward) diff --git a/gr-wavelet/lib/wvps_ff_impl.cc b/gr-wavelet/lib/wvps_ff_impl.cc index 6e886bff4e..3dd6bf4ba9 100644 --- a/gr-wavelet/lib/wvps_ff_impl.cc +++ b/gr-wavelet/lib/wvps_ff_impl.cc @@ -25,7 +25,7 @@ #endif #include <wvps_ff_impl.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> namespace gr { @@ -45,9 +45,9 @@ namespace gr { } wvps_ff_impl::wvps_ff_impl(int ilen) - : gr_sync_block("wvps_ff", - gr_make_io_signature(1, 1, sizeof(float) * ilen), - gr_make_io_signature(1, 1, sizeof(float) * ceil_log2(ilen))), + : sync_block("wvps_ff", + io_signature::make(1, 1, sizeof(float) * ilen), + io_signature::make(1, 1, sizeof(float) * ceil_log2(ilen))), d_ilen(ilen), d_olen(ceil_log2(ilen)) { } |