diff options
| author | Thomas Habets <thomas@habets.se> | 2020-03-14 12:01:44 +0000 |
|---|---|---|
| committer | Michael Dickens <michael.dickens@ettus.com> | 2020-04-01 11:44:45 -0400 |
| commit | 7a9169fe8cca1cb378be0d0d403e03a338ffbfda (patch) | |
| tree | fef77ae9c34538b78e4172580cb5ecdc24d40134 /gr-filter | |
| parent | 82262753a56d15cfa6343044c726cf0035c38d9c (diff) | |
Switch from boost pointers to std C++11 pointers
Most of this code is automated code changes:
```
set -e
SUB="s/dummy/dummy/"
for i in shared_ptr make_shared dynamic_pointer_cast weak_ptr enable_shared_from_this get_deleter; do
SUB="$SUB;s/boost::$i/std::$i/g"
done
SUB="$SUB;s^#include <boost/shared_ptr.hpp>^#include <memory>^g"
SUB="$SUB;s^namespace boost^namespace std^g"
find . \( -name "*.cc" -o -name "*.h" -o -name "*.i" -o -name "*.cxx" -o -name "*.py" \) -print0 | xargs -0 sed -i "$SUB"
```
Only one manual change. In `./gr-fec/lib/fec_mtrx_impl.cc`, add
`#include <algorithm>`.
Diffstat (limited to 'gr-filter')
31 files changed, 31 insertions, 31 deletions
diff --git a/gr-filter/include/gnuradio/filter/dc_blocker_cc.h b/gr-filter/include/gnuradio/filter/dc_blocker_cc.h index 1dd89830e..6a08ebf8e 100644 --- a/gr-filter/include/gnuradio/filter/dc_blocker_cc.h +++ b/gr-filter/include/gnuradio/filter/dc_blocker_cc.h @@ -46,7 +46,7 @@ class FILTER_API dc_blocker_cc : virtual public sync_block { public: // gr::filter::dc_blocker_cc::sptr - typedef boost::shared_ptr<dc_blocker_cc> sptr; + typedef std::shared_ptr<dc_blocker_cc> sptr; /*! * Make a DC blocker block. diff --git a/gr-filter/include/gnuradio/filter/dc_blocker_ff.h b/gr-filter/include/gnuradio/filter/dc_blocker_ff.h index 6b792036a..89df5dd5a 100644 --- a/gr-filter/include/gnuradio/filter/dc_blocker_ff.h +++ b/gr-filter/include/gnuradio/filter/dc_blocker_ff.h @@ -49,7 +49,7 @@ class FILTER_API dc_blocker_ff : virtual public sync_block { public: // gr::filter::dc_blocker_ff::sptr - typedef boost::shared_ptr<dc_blocker_ff> sptr; + typedef std::shared_ptr<dc_blocker_ff> sptr; /*! * Make a DC blocker block. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_ccc.h b/gr-filter/include/gnuradio/filter/fft_filter_ccc.h index 02d6fc125..ca6ea58e4 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_ccc.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_ccc.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_ccc : virtual public sync_decimator { public: // gr::filter::fft_filter_ccc::sptr - typedef boost::shared_ptr<fft_filter_ccc> sptr; + typedef std::shared_ptr<fft_filter_ccc> sptr; /*! * Build an FFT filter blocks. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_ccf.h b/gr-filter/include/gnuradio/filter/fft_filter_ccf.h index b5f718a3b..087af352f 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_ccf.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_ccf.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_ccf : virtual public sync_decimator { public: // gr::filter::fft_filter_ccf::sptr - typedef boost::shared_ptr<fft_filter_ccf> sptr; + typedef std::shared_ptr<fft_filter_ccf> sptr; /*! * Build an FFT filter blocks. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_fff.h b/gr-filter/include/gnuradio/filter/fft_filter_fff.h index 1681d65f0..1a0e2ebf0 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_fff.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_fff.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_fff : virtual public sync_decimator { public: // gr::filter::fft_filter_fff::sptr - typedef boost::shared_ptr<fft_filter_fff> sptr; + typedef std::shared_ptr<fft_filter_fff> sptr; /*! * Build an FFT filter block. diff --git a/gr-filter/include/gnuradio/filter/filter_delay_fc.h b/gr-filter/include/gnuradio/filter/filter_delay_fc.h index 670d226aa..349592085 100644 --- a/gr-filter/include/gnuradio/filter/filter_delay_fc.h +++ b/gr-filter/include/gnuradio/filter/filter_delay_fc.h @@ -41,7 +41,7 @@ class FILTER_API filter_delay_fc : virtual public sync_block { public: // gr::filter::filter_delay_fc::sptr - typedef boost::shared_ptr<filter_delay_fc> sptr; + typedef std::shared_ptr<filter_delay_fc> sptr; /*! * Build a filter with delay block. diff --git a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h index d2c6d04ae..98bc93545 100644 --- a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h +++ b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h @@ -31,7 +31,7 @@ namespace filter { class FILTER_API filterbank_vcvcf : virtual public block { public: - typedef boost::shared_ptr<filterbank_vcvcf> sptr; + typedef std::shared_ptr<filterbank_vcvcf> sptr; /*! * Build the filterbank. diff --git a/gr-filter/include/gnuradio/filter/fir_filter_blk.h b/gr-filter/include/gnuradio/filter/fir_filter_blk.h index aa5e9798a..28640e8f0 100644 --- a/gr-filter/include/gnuradio/filter/fir_filter_blk.h +++ b/gr-filter/include/gnuradio/filter/fir_filter_blk.h @@ -46,7 +46,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API fir_filter_blk : virtual public sync_decimator { public: - typedef boost::shared_ptr<fir_filter_blk<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<fir_filter_blk<IN_T, OUT_T, TAP_T>> sptr; /*! * \brief FIR filter with IN_T input, OUT_T output, and TAP_T taps diff --git a/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h b/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h index 83d0e540c..6f225800e 100644 --- a/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h +++ b/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h @@ -46,7 +46,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API freq_xlating_fir_filter : virtual public sync_decimator { public: - typedef boost::shared_ptr<freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>> sptr; /*! * \brief FIR filter with IN_T input, OUT_T output, and diff --git a/gr-filter/include/gnuradio/filter/hilbert_fc.h b/gr-filter/include/gnuradio/filter/hilbert_fc.h index c9ed6059b..485202987 100644 --- a/gr-filter/include/gnuradio/filter/hilbert_fc.h +++ b/gr-filter/include/gnuradio/filter/hilbert_fc.h @@ -32,7 +32,7 @@ class FILTER_API hilbert_fc : virtual public sync_block { public: // gr::filter::hilbert_fc::sptr - typedef boost::shared_ptr<hilbert_fc> sptr; + typedef std::shared_ptr<hilbert_fc> sptr; /*! * Build a Hilbert transformer filter block. diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccc.h b/gr-filter/include/gnuradio/filter/iir_filter_ccc.h index d2dcaa29f..79ca425e3 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccc.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccc.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccc : virtual public sync_block { public: // gr::filter::iir_filter_ccc::sptr - typedef boost::shared_ptr<iir_filter_ccc> sptr; + typedef std::shared_ptr<iir_filter_ccc> sptr; static sptr make(const std::vector<gr_complex>& fftaps, const std::vector<gr_complex>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccd.h b/gr-filter/include/gnuradio/filter/iir_filter_ccd.h index 29e90ccbe..c2b5e2a69 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccd.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccd.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccd : virtual public sync_block { public: // gr::filter::iir_filter_ccd::sptr - typedef boost::shared_ptr<iir_filter_ccd> sptr; + typedef std::shared_ptr<iir_filter_ccd> sptr; static sptr make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccf.h b/gr-filter/include/gnuradio/filter/iir_filter_ccf.h index 4fe8d9e3b..58ac2c92c 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccf.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccf.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccf : virtual public sync_block { public: // gr::filter::iir_filter_ccf::sptr - typedef boost::shared_ptr<iir_filter_ccf> sptr; + typedef std::shared_ptr<iir_filter_ccf> sptr; static sptr make(const std::vector<float>& fftaps, const std::vector<float>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccz.h b/gr-filter/include/gnuradio/filter/iir_filter_ccz.h index 2441b37e2..8f9cc5cee 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccz.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccz.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccz : virtual public sync_block { public: // gr::filter::iir_filter_ccz::sptr - typedef boost::shared_ptr<iir_filter_ccz> sptr; + typedef std::shared_ptr<iir_filter_ccz> sptr; static sptr make(const std::vector<gr_complexd>& fftaps, const std::vector<gr_complexd>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ffd.h b/gr-filter/include/gnuradio/filter/iir_filter_ffd.h index 978400b02..44f2c7784 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ffd.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ffd.h @@ -55,7 +55,7 @@ class FILTER_API iir_filter_ffd : virtual public sync_block { public: // gr::filter::iir_filter_ffd::sptr - typedef boost::shared_ptr<iir_filter_ffd> sptr; + typedef std::shared_ptr<iir_filter_ffd> sptr; static sptr make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/interp_fir_filter.h b/gr-filter/include/gnuradio/filter/interp_fir_filter.h index fd607a452..608134be1 100644 --- a/gr-filter/include/gnuradio/filter/interp_fir_filter.h +++ b/gr-filter/include/gnuradio/filter/interp_fir_filter.h @@ -48,7 +48,7 @@ class FILTER_API interp_fir_filter : virtual public sync_interpolator { public: // gr::filter::interp_fir_filter::sptr - typedef boost::shared_ptr<interp_fir_filter> sptr; + typedef std::shared_ptr<interp_fir_filter> sptr; /*! * \brief Interpolating FIR filter with IN_T input, OUT_T output, and TAP_T taps diff --git a/gr-filter/include/gnuradio/filter/ival_decimator.h b/gr-filter/include/gnuradio/filter/ival_decimator.h index 363e481e8..434bfddee 100644 --- a/gr-filter/include/gnuradio/filter/ival_decimator.h +++ b/gr-filter/include/gnuradio/filter/ival_decimator.h @@ -29,7 +29,7 @@ namespace filter { class FILTER_API ival_decimator : virtual public gr::sync_decimator { public: - typedef boost::shared_ptr<ival_decimator> sptr; + typedef std::shared_ptr<ival_decimator> sptr; static sptr make(int decimation, int data_size); }; diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h index 905574ad3..bf11a0f87 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h @@ -25,7 +25,7 @@ class FILTER_API mmse_interpolator_cc : virtual public block { public: // gr::filter::mmse_interpolator_cc::sptr - typedef boost::shared_ptr<mmse_interpolator_cc> sptr; + typedef std::shared_ptr<mmse_interpolator_cc> sptr; /*! * \brief Build the interpolating MMSE filter (complex input, complex output) diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h index b96a5efb7..24589c9a4 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h @@ -25,7 +25,7 @@ class FILTER_API mmse_interpolator_ff : virtual public block { public: // gr::filter::mmse_interpolator_ff::sptr - typedef boost::shared_ptr<mmse_interpolator_ff> sptr; + typedef std::shared_ptr<mmse_interpolator_ff> sptr; /*! * \brief Build the interpolating MMSE filter (float input, float output) diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h index 6e994400e..03d1060f1 100644 --- a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h @@ -30,7 +30,7 @@ class FILTER_API mmse_resampler_cc : virtual public block { public: // gr::filter::mmse_resampler_cc::sptr - typedef boost::shared_ptr<mmse_resampler_cc> sptr; + typedef std::shared_ptr<mmse_resampler_cc> sptr; /*! * \brief Build the resampling MMSE filter (complex input, complex output) diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h index ac905f316..8494aa338 100644 --- a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h @@ -31,7 +31,7 @@ class FILTER_API mmse_resampler_ff : virtual public block { public: // gr::filter::mmse_resampler_ff::sptr - typedef boost::shared_ptr<mmse_resampler_ff> sptr; + typedef std::shared_ptr<mmse_resampler_ff> sptr; /*! * \brief Build the resampling MMSE filter (float input, float output) diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h index 87cd907fb..783b1cfd5 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h @@ -35,7 +35,7 @@ class FILTER_API pfb_arb_resampler_ccc : virtual public block { public: // gr::filter::pfb_arb_resampler_ccc::sptr - typedef boost::shared_ptr<pfb_arb_resampler_ccc> sptr; + typedef std::shared_ptr<pfb_arb_resampler_ccc> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h index 85066aeb9..196905db5 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h @@ -35,7 +35,7 @@ class FILTER_API pfb_arb_resampler_ccf : virtual public block { public: // gr::filter::pfb_arb_resampler_ccf::sptr - typedef boost::shared_ptr<pfb_arb_resampler_ccf> sptr; + typedef std::shared_ptr<pfb_arb_resampler_ccf> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h index 412c14c8d..ec3c719c7 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h @@ -84,7 +84,7 @@ class FILTER_API pfb_arb_resampler_fff : virtual public block { public: // gr::filter::pfb_arb_resampler_fff::sptr - typedef boost::shared_ptr<pfb_arb_resampler_fff> sptr; + typedef std::shared_ptr<pfb_arb_resampler_fff> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h index 01b8893f3..b71f6bfc3 100644 --- a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h @@ -101,7 +101,7 @@ class FILTER_API pfb_channelizer_ccf : virtual public block { public: // gr::filter::pfb_channelizer_ccf::sptr - typedef boost::shared_ptr<pfb_channelizer_ccf> sptr; + typedef std::shared_ptr<pfb_channelizer_ccf> sptr; /*! * Build the polyphase filterbank decimator. diff --git a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h index 223b46914..34edd23b3 100644 --- a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h @@ -80,7 +80,7 @@ class FILTER_API pfb_decimator_ccf : virtual public sync_block { public: // gr::filter::pfb_decimator_ccf::sptr - typedef boost::shared_ptr<pfb_decimator_ccf> sptr; + typedef std::shared_ptr<pfb_decimator_ccf> sptr; /*! * Build the polyphase filterbank decimator. diff --git a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h index baf4bd483..1303f3a6f 100644 --- a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h @@ -68,7 +68,7 @@ class FILTER_API pfb_interpolator_ccf : virtual public sync_interpolator { public: // gr::filter::pfb_interpolator_ccf::sptr - typedef boost::shared_ptr<pfb_interpolator_ccf> sptr; + typedef std::shared_ptr<pfb_interpolator_ccf> sptr; /*! * Build the polyphase filterbank interpolator. diff --git a/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h index af2abb838..720d48183 100644 --- a/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h @@ -78,7 +78,7 @@ class FILTER_API pfb_synthesizer_ccf : virtual public sync_interpolator { public: // gr::filter::pfb_synthesizer_ccf::sptr - typedef boost::shared_ptr<pfb_synthesizer_ccf> sptr; + typedef std::shared_ptr<pfb_synthesizer_ccf> sptr; /*! * Build the polyphase synthesis filterbank. diff --git a/gr-filter/include/gnuradio/filter/rational_resampler_base.h b/gr-filter/include/gnuradio/filter/rational_resampler_base.h index 1d252bcd8..9b0af4b54 100644 --- a/gr-filter/include/gnuradio/filter/rational_resampler_base.h +++ b/gr-filter/include/gnuradio/filter/rational_resampler_base.h @@ -58,7 +58,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API rational_resampler_base : virtual public block { public: - typedef boost::shared_ptr<rational_resampler_base<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<rational_resampler_base<IN_T, OUT_T, TAP_T>> sptr; /*! * Make a rational resampling FIR filter. diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h index 0c9cba34f..7d349fb74 100644 --- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h +++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h @@ -54,7 +54,7 @@ class FILTER_API single_pole_iir_filter_cc : virtual public sync_block { public: // gr::filter::single_pole_iir_filter_cc::sptr - typedef boost::shared_ptr<single_pole_iir_filter_cc> sptr; + typedef std::shared_ptr<single_pole_iir_filter_cc> sptr; static sptr make(double alpha, unsigned int vlen = 1); diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h index 504e142a9..df48191e1 100644 --- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h +++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h @@ -54,7 +54,7 @@ class FILTER_API single_pole_iir_filter_ff : virtual public sync_block { public: // gr::filter::single_pole_iir_filter_ff::sptr - typedef boost::shared_ptr<single_pole_iir_filter_ff> sptr; + typedef std::shared_ptr<single_pole_iir_filter_ff> sptr; static sptr make(double alpha, unsigned int vlen = 1); |