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-vocoder/include/gnuradio | |
| 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-vocoder/include/gnuradio')
18 files changed, 18 insertions, 18 deletions
diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h index 12ddebc1cd..01e729af0e 100644 --- a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API alaw_decode_bs : virtual public sync_block { public: // gr::vocoder::alaw_decode_bs::sptr - typedef boost::shared_ptr<alaw_decode_bs> sptr; + typedef std::shared_ptr<alaw_decode_bs> sptr; /*! * \brief Make alaw decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h index ba7e81d958..210b479a31 100644 --- a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API alaw_encode_sb : virtual public sync_block { public: // gr::vocoder::alaw_encode_sb::sptr - typedef boost::shared_ptr<alaw_encode_sb> sptr; + typedef std::shared_ptr<alaw_encode_sb> sptr; /*! * \brief Make alaw encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h index a5b752ff93..340ab68b30 100644 --- a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h @@ -32,7 +32,7 @@ class VOCODER_API codec2_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::codec2_decode_ps::sptr - typedef boost::shared_ptr<codec2_decode_ps> sptr; + typedef std::shared_ptr<codec2_decode_ps> sptr; /*! * \brief Make Codec2 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h index 6a2cceb125..4d8ad3b279 100644 --- a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h @@ -33,7 +33,7 @@ class VOCODER_API codec2_encode_sp : virtual public sync_decimator { public: // gr::vocoder::codec2_encode_sp::sptr - typedef boost::shared_ptr<codec2_encode_sp> sptr; + typedef std::shared_ptr<codec2_encode_sp> sptr; /*! * \brief Make Codec2 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h index f4551b95e2..8d791c9a29 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h @@ -79,7 +79,7 @@ class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator { public: // gr::vocoder::cvsd_decode_bs::sptr - typedef boost::shared_ptr<cvsd_decode_bs> sptr; + typedef std::shared_ptr<cvsd_decode_bs> sptr; /*! * \brief Constructor parameters to initialize the CVSD decoder. diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h index 1a4961cca6..ee3591f7e2 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h @@ -76,7 +76,7 @@ class VOCODER_API cvsd_encode_sb : virtual public sync_decimator { public: // gr::vocoder::cvsd_encode_sb::sptr - typedef boost::shared_ptr<cvsd_encode_sb> sptr; + typedef std::shared_ptr<cvsd_encode_sb> sptr; /*! * \brief Constructor parameters to initialize the CVSD encoder. diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h index b5a629ea3d..5077329465 100644 --- a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h +++ b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h @@ -31,7 +31,7 @@ namespace vocoder { class VOCODER_API freedv_rx_ss : virtual public gr::block { public: - typedef boost::shared_ptr<freedv_rx_ss> sptr; + typedef std::shared_ptr<freedv_rx_ss> sptr; /*! * \brief Make FreeDV modem demodulator block. diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h index a52c62bd22..b2b42b4bba 100644 --- a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h +++ b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h @@ -30,7 +30,7 @@ namespace vocoder { class VOCODER_API freedv_tx_ss : virtual public gr::sync_block { public: - typedef boost::shared_ptr<freedv_tx_ss> sptr; + typedef std::shared_ptr<freedv_tx_ss> sptr; /*! * \brief Make FreeDV Modem modulator block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h index 53440c3d71..82ec4c0643 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g721_decode_bs : virtual public sync_block { public: // gr::vocoder::g721_decode_bs::sptr - typedef boost::shared_ptr<g721_decode_bs> sptr; + typedef std::shared_ptr<g721_decode_bs> sptr; /*! * \brief Make G721 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h index 4ffd6c06d1..b8ca52d70d 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g721_encode_sb : virtual public sync_block { public: // gr::vocoder::g721_encode_sb::sptr - typedef boost::shared_ptr<g721_encode_sb> sptr; + typedef std::shared_ptr<g721_encode_sb> sptr; /*! * \brief Make G721 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h index 94dbf7223c..fb6f9d95f6 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g723_24_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_24_decode_bs::sptr - typedef boost::shared_ptr<g723_24_decode_bs> sptr; + typedef std::shared_ptr<g723_24_decode_bs> sptr; /*! * \brief Make G722_24 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h index a795887c20..492ce45d1c 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g723_24_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_24_encode_sb::sptr - typedef boost::shared_ptr<g723_24_encode_sb> sptr; + typedef std::shared_ptr<g723_24_encode_sb> sptr; /*! * \brief Make G722_24 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h index d3aeed6eb9..22beb197a4 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g723_40_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_40_decode_bs::sptr - typedef boost::shared_ptr<g723_40_decode_bs> sptr; + typedef std::shared_ptr<g723_40_decode_bs> sptr; /*! * \brief Make G722_40 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h index a24a3a279c..06468eb18c 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g723_40_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_40_encode_sb::sptr - typedef boost::shared_ptr<g723_40_encode_sb> sptr; + typedef std::shared_ptr<g723_40_encode_sb> sptr; /*! * \brief Make G722_40 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h index 40c066bdbc..2b97045c76 100644 --- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h @@ -28,7 +28,7 @@ class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::gsm_fr_decode_ps::sptr - typedef boost::shared_ptr<gsm_fr_decode_ps> sptr; + typedef std::shared_ptr<gsm_fr_decode_ps> sptr; /*! * \brief Make GSM decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h index 0c64bc2f74..ab3c3026a3 100644 --- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h @@ -28,7 +28,7 @@ class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator { public: // gr::vocoder::gsm_fr_encode_sp::sptr - typedef boost::shared_ptr<gsm_fr_encode_sp> sptr; + typedef std::shared_ptr<gsm_fr_encode_sp> sptr; /*! * \brief Make GSM encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h index 70c9c80f25..1696e2c6c9 100644 --- a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API ulaw_decode_bs : virtual public sync_block { public: // gr::vocoder::ulaw_decode_bs::sptr - typedef boost::shared_ptr<ulaw_decode_bs> sptr; + typedef std::shared_ptr<ulaw_decode_bs> sptr; /*! * \brief Make ulaw decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h index 07741bb8aa..b63d5420ba 100644 --- a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API ulaw_encode_sb : virtual public sync_block { public: // gr::vocoder::ulaw_encode_sb::sptr - typedef boost::shared_ptr<ulaw_encode_sb> sptr; + typedef std::shared_ptr<ulaw_encode_sb> sptr; /*! * \brief Make ulaw encoder block. |