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-fft | |
parent | modtool: use prefix path for modtool instead of prefs (diff) | |
download | gnuradio-7a9169fe8cca1cb378be0d0d403e03a338ffbfda.tar.xz gnuradio-7a9169fe8cca1cb378be0d0d403e03a338ffbfda.zip |
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-fft')
-rw-r--r-- | gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h | 2 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft_vcc.h | 2 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/fft_vfc.h | 2 | ||||
-rw-r--r-- | gr-fft/include/gnuradio/fft/goertzel_fc.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h b/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h index 9f041a3a9..623804691 100644 --- a/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h +++ b/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h @@ -31,7 +31,7 @@ namespace fft { class FFT_API ctrlport_probe_psd : virtual public gr::sync_block { public: - typedef boost::shared_ptr<ctrlport_probe_psd> sptr; + typedef std::shared_ptr<ctrlport_probe_psd> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-fft/include/gnuradio/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h index eb2ac2f81..95d1f1855 100644 --- a/gr-fft/include/gnuradio/fft/fft_vcc.h +++ b/gr-fft/include/gnuradio/fft/fft_vcc.h @@ -48,7 +48,7 @@ class FFT_API fft_vcc : virtual public sync_block { public: // gr::fft::fft_vcc::sptr - typedef boost::shared_ptr<fft_vcc> sptr; + typedef std::shared_ptr<fft_vcc> sptr; /*! \brief * \param[in] fft_size N. * \param[in] forward True performs FFT, False performs IFFT. diff --git a/gr-fft/include/gnuradio/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h index f9a10797a..21859abe1 100644 --- a/gr-fft/include/gnuradio/fft/fft_vfc.h +++ b/gr-fft/include/gnuradio/fft/fft_vfc.h @@ -48,7 +48,7 @@ class FFT_API fft_vfc : virtual public sync_block { public: // gr::fft::fft_vfc::sptr - typedef boost::shared_ptr<fft_vfc> sptr; + typedef std::shared_ptr<fft_vfc> sptr; /*! \brief * \param[in] fft_size N. diff --git a/gr-fft/include/gnuradio/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h index 46e655fac..f3ff011a0 100644 --- a/gr-fft/include/gnuradio/fft/goertzel_fc.h +++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h @@ -25,7 +25,7 @@ class FFT_API goertzel_fc : virtual public sync_decimator { public: // gr::fft::goertzel_fc::sptr - typedef boost::shared_ptr<goertzel_fc> sptr; + typedef std::shared_ptr<goertzel_fc> sptr; static sptr make(int rate, int len, float freq); |