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-digital/include | |
| 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-digital/include')
66 files changed, 80 insertions, 85 deletions
diff --git a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h index 9b207e5dfb..3e80606d6d 100644 --- a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h @@ -42,7 +42,7 @@ class DIGITAL_API additive_scrambler_bb : virtual public sync_block { public: // gr::digital::additive_scrambler_bb::sptr - typedef boost::shared_ptr<additive_scrambler_bb> sptr; + typedef std::shared_ptr<additive_scrambler_bb> sptr; /*! * \brief Create additive scrambler. diff --git a/gr-digital/include/gnuradio/digital/binary_slicer_fb.h b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h index 0e56e1ffb4..3bd58e67e5 100644 --- a/gr-digital/include/gnuradio/digital/binary_slicer_fb.h +++ b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h @@ -29,7 +29,7 @@ class DIGITAL_API binary_slicer_fb : virtual public sync_block { public: // gr::digital::binary_slicer_fb::sptr - typedef boost::shared_ptr<binary_slicer_fb> sptr; + typedef std::shared_ptr<binary_slicer_fb> sptr; /*! * \brief Make binary symbol slicer block. diff --git a/gr-digital/include/gnuradio/digital/burst_shaper.h b/gr-digital/include/gnuradio/digital/burst_shaper.h index 57b2d23675..494d102023 100644 --- a/gr-digital/include/gnuradio/digital/burst_shaper.h +++ b/gr-digital/include/gnuradio/digital/burst_shaper.h @@ -52,7 +52,7 @@ template <class T> class DIGITAL_API burst_shaper : virtual public block { public: - typedef boost::shared_ptr<burst_shaper<T>> sptr; + typedef std::shared_ptr<burst_shaper<T>> sptr; /*! * Make a burst shaper block. diff --git a/gr-digital/include/gnuradio/digital/chunks_to_symbols.h b/gr-digital/include/gnuradio/digital/chunks_to_symbols.h index b81af69480..950977cdde 100644 --- a/gr-digital/include/gnuradio/digital/chunks_to_symbols.h +++ b/gr-digital/include/gnuradio/digital/chunks_to_symbols.h @@ -43,7 +43,7 @@ template <class IN_T, class OUT_T> class DIGITAL_API chunks_to_symbols : virtual public sync_interpolator { public: - typedef boost::shared_ptr<chunks_to_symbols<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<chunks_to_symbols<IN_T, OUT_T>> sptr; /*! * Make a chunks-to-symbols block. diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h index 57f38bec99..f4e7a0c863 100644 --- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h +++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h @@ -60,7 +60,7 @@ class DIGITAL_API clock_recovery_mm_cc : virtual public block { public: // gr::digital::clock_recovery_mm_cc::sptr - typedef boost::shared_ptr<clock_recovery_mm_cc> sptr; + typedef std::shared_ptr<clock_recovery_mm_cc> sptr; /*! * Make a M&M clock recovery block. diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h index 926d070d39..d0672cf828 100644 --- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h +++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h @@ -57,7 +57,7 @@ class DIGITAL_API clock_recovery_mm_ff : virtual public block { public: // gr::digital::clock_recovery_mm_ff::sptr - typedef boost::shared_ptr<clock_recovery_mm_ff> sptr; + typedef std::shared_ptr<clock_recovery_mm_ff> sptr; /*! * Make a M&M clock recovery block. diff --git a/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h index 3071849dde..d398fabb47 100644 --- a/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h @@ -37,7 +37,7 @@ protected: public: // gr::digital::cma_equalizer_cc::sptr - typedef boost::shared_ptr<cma_equalizer_cc> sptr; + typedef std::shared_ptr<cma_equalizer_cc> sptr; /*! * Make a CMA Equalizer block diff --git a/gr-digital/include/gnuradio/digital/constellation.h b/gr-digital/include/gnuradio/digital/constellation.h index d87e221263..4924733d6d 100644 --- a/gr-digital/include/gnuradio/digital/constellation.h +++ b/gr-digital/include/gnuradio/digital/constellation.h @@ -16,7 +16,6 @@ #include <gnuradio/gr_complex.h> #include <pmt/pmt.h> #include <boost/any.hpp> -#include <boost/enable_shared_from_this.hpp> #include <vector> namespace gr { @@ -29,7 +28,7 @@ namespace digital { /************************************************************/ class constellation; -typedef boost::shared_ptr<constellation> constellation_sptr; +typedef std::shared_ptr<constellation> constellation_sptr; /*! * \brief An abstracted constellation object @@ -47,7 +46,7 @@ typedef boost::shared_ptr<constellation> constellation_sptr; * from this class and overloaded to perform optimized slicing and * constellation mappings. */ -class DIGITAL_API constellation : public boost::enable_shared_from_this<constellation> +class DIGITAL_API constellation : public std::enable_shared_from_this<constellation> { public: constellation(std::vector<gr_complex> constell, @@ -224,7 +223,7 @@ protected: class DIGITAL_API constellation_calcdist : public constellation { public: - typedef boost::shared_ptr<constellation_calcdist> sptr; + typedef std::shared_ptr<constellation_calcdist> sptr; /*! * Make a general constellation object that calculates the Euclidean distance for hard @@ -325,7 +324,7 @@ private: class DIGITAL_API constellation_rect : public constellation_sector { public: - typedef boost::shared_ptr<constellation_rect> sptr; + typedef std::shared_ptr<constellation_rect> sptr; /*! * Make a rectangular constellation object. @@ -394,7 +393,7 @@ private: class DIGITAL_API constellation_expl_rect : public constellation_rect { public: - typedef boost::shared_ptr<constellation_expl_rect> sptr; + typedef std::shared_ptr<constellation_expl_rect> sptr; static sptr make(std::vector<gr_complex> constellation, std::vector<int> pre_diff_code, @@ -444,7 +443,7 @@ private: class DIGITAL_API constellation_psk : public constellation_sector { public: - typedef boost::shared_ptr<constellation_psk> sptr; + typedef std::shared_ptr<constellation_psk> sptr; // public constructor static sptr make(std::vector<gr_complex> constell, @@ -483,7 +482,7 @@ protected: class DIGITAL_API constellation_bpsk : public constellation { public: - typedef boost::shared_ptr<constellation_bpsk> sptr; + typedef std::shared_ptr<constellation_bpsk> sptr; // public constructor static sptr make(); @@ -519,7 +518,7 @@ protected: class DIGITAL_API constellation_qpsk : public constellation { public: - typedef boost::shared_ptr<constellation_qpsk> sptr; + typedef std::shared_ptr<constellation_qpsk> sptr; // public constructor static sptr make(); @@ -554,7 +553,7 @@ protected: class DIGITAL_API constellation_dqpsk : public constellation { public: - typedef boost::shared_ptr<constellation_dqpsk> sptr; + typedef std::shared_ptr<constellation_dqpsk> sptr; // public constructor static sptr make(); @@ -591,7 +590,7 @@ protected: class DIGITAL_API constellation_8psk : public constellation { public: - typedef boost::shared_ptr<constellation_8psk> sptr; + typedef std::shared_ptr<constellation_8psk> sptr; // public constructor static sptr make(); @@ -627,7 +626,7 @@ protected: class DIGITAL_API constellation_8psk_natural : public constellation { public: - typedef boost::shared_ptr<constellation_8psk_natural> sptr; + typedef std::shared_ptr<constellation_8psk_natural> sptr; // public constructor static sptr make(); @@ -665,7 +664,7 @@ protected: class DIGITAL_API constellation_16qam : public constellation { public: - typedef boost::shared_ptr<constellation_16qam> sptr; + typedef std::shared_ptr<constellation_16qam> sptr; // public constructor static sptr make(); diff --git a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h index a47af55080..f53f9fdd79 100644 --- a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h +++ b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h @@ -31,7 +31,7 @@ class DIGITAL_API constellation_decoder_cb : virtual public block { public: // gr::digital::constellation_decoder_cb::sptr - typedef boost::shared_ptr<constellation_decoder_cb> sptr; + typedef std::shared_ptr<constellation_decoder_cb> sptr; /*! * \brief Make constellation decoder block. diff --git a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h index f29a14fac0..333d717c2b 100644 --- a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h +++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h @@ -48,7 +48,7 @@ class DIGITAL_API constellation_receiver_cb : virtual public block, { public: // gr::digital::constellation_receiver_cb::sptr - typedef boost::shared_ptr<constellation_receiver_cb> sptr; + typedef std::shared_ptr<constellation_receiver_cb> sptr; /*! * \brief Constructs a constellation receiver that (phase/fine diff --git a/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h b/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h index 75e468bfd4..8d3772cf92 100644 --- a/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h +++ b/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h @@ -31,7 +31,7 @@ class DIGITAL_API constellation_soft_decoder_cf : virtual public sync_interpolat { public: // gr::digital::constellation_soft_decoder_cf::sptr - typedef boost::shared_ptr<constellation_soft_decoder_cf> sptr; + typedef std::shared_ptr<constellation_soft_decoder_cf> sptr; /*! * \brief Make constellation decoder block. diff --git a/gr-digital/include/gnuradio/digital/corr_est_cc.h b/gr-digital/include/gnuradio/digital/corr_est_cc.h index da0f84ceb6..78acb4075e 100644 --- a/gr-digital/include/gnuradio/digital/corr_est_cc.h +++ b/gr-digital/include/gnuradio/digital/corr_est_cc.h @@ -78,7 +78,7 @@ typedef enum { class DIGITAL_API corr_est_cc : virtual public sync_block { public: - typedef boost::shared_ptr<corr_est_cc> sptr; + typedef std::shared_ptr<corr_est_cc> sptr; /*! * Make a block that correlates against the \p symbols vector diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h index 2c89b560e1..de54a2585e 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h @@ -37,7 +37,7 @@ class DIGITAL_API correlate_access_code_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_bb::sptr - typedef boost::shared_ptr<correlate_access_code_bb> sptr; + typedef std::shared_ptr<correlate_access_code_bb> sptr; /*! * Make a correlate_access_code block. diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h index 3ff172fde1..f1aff6872d 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h @@ -41,7 +41,7 @@ class DIGITAL_API correlate_access_code_bb_ts : virtual public block { public: // gr::digital::correlate_access_code_bb_ts::sptr - typedef boost::shared_ptr<correlate_access_code_bb_ts> sptr; + typedef std::shared_ptr<correlate_access_code_bb_ts> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h index 335c8cc780..c4ce06cf73 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h @@ -41,7 +41,7 @@ class DIGITAL_API correlate_access_code_ff_ts : virtual public block { public: // gr::digital::correlate_access_code_ff_ts::sptr - typedef boost::shared_ptr<correlate_access_code_ff_ts> sptr; + typedef std::shared_ptr<correlate_access_code_ff_ts> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h index b44f9f9277..9ab0da660b 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h @@ -34,7 +34,7 @@ class DIGITAL_API correlate_access_code_tag_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_tag_bb::sptr - typedef boost::shared_ptr<correlate_access_code_tag_bb> sptr; + typedef std::shared_ptr<correlate_access_code_tag_bb> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h index e6f7962059..bc921ec1d4 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h @@ -35,7 +35,7 @@ class DIGITAL_API correlate_access_code_tag_ff : virtual public sync_block { public: // gr::digital::correlate_access_code_tag_ff::sptr - typedef boost::shared_ptr<correlate_access_code_tag_ff> sptr; + typedef std::shared_ptr<correlate_access_code_tag_ff> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h index cd7f45c353..3065b42065 100644 --- a/gr-digital/include/gnuradio/digital/costas_loop_cc.h +++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h @@ -55,7 +55,7 @@ class DIGITAL_API costas_loop_cc : virtual public sync_block, { public: // gr::digital::costas_loop_cc::sptr - typedef boost::shared_ptr<costas_loop_cc> sptr; + typedef std::shared_ptr<costas_loop_cc> sptr; /*! * Make a Costas loop carrier recovery block. diff --git a/gr-digital/include/gnuradio/digital/cpmmod_bc.h b/gr-digital/include/gnuradio/digital/cpmmod_bc.h index b7d2faf0bd..dca28e551f 100644 --- a/gr-digital/include/gnuradio/digital/cpmmod_bc.h +++ b/gr-digital/include/gnuradio/digital/cpmmod_bc.h @@ -38,7 +38,7 @@ class DIGITAL_API cpmmod_bc : virtual public hier_block2 { public: // gr::digital::cpmmod_bc::sptr - typedef boost::shared_ptr<cpmmod_bc> sptr; + typedef std::shared_ptr<cpmmod_bc> sptr; /*! * Make CPM modulator block. diff --git a/gr-digital/include/gnuradio/digital/crc32_async_bb.h b/gr-digital/include/gnuradio/digital/crc32_async_bb.h index 4e3e93c0bb..86dfd06ee7 100644 --- a/gr-digital/include/gnuradio/digital/crc32_async_bb.h +++ b/gr-digital/include/gnuradio/digital/crc32_async_bb.h @@ -44,7 +44,7 @@ namespace digital { class DIGITAL_API crc32_async_bb : virtual public block { public: - typedef boost::shared_ptr<crc32_async_bb> sptr; + typedef std::shared_ptr<crc32_async_bb> sptr; /*! * \param check Set to true if you want to check CRC, false to create CRC. diff --git a/gr-digital/include/gnuradio/digital/crc32_bb.h b/gr-digital/include/gnuradio/digital/crc32_bb.h index 4fa111de27..18153e8d2c 100644 --- a/gr-digital/include/gnuradio/digital/crc32_bb.h +++ b/gr-digital/include/gnuradio/digital/crc32_bb.h @@ -33,7 +33,7 @@ namespace digital { class DIGITAL_API crc32_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<crc32_bb> sptr; + typedef std::shared_ptr<crc32_bb> sptr; /*! * \param check Set to true if you want to check CRC, false to create CRC. diff --git a/gr-digital/include/gnuradio/digital/descrambler_bb.h b/gr-digital/include/gnuradio/digital/descrambler_bb.h index e7b0c1fcd6..446754f58f 100644 --- a/gr-digital/include/gnuradio/digital/descrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/descrambler_bb.h @@ -30,7 +30,7 @@ class DIGITAL_API descrambler_bb : virtual public sync_block { public: // gr::digital::descrambler_bb::sptr - typedef boost::shared_ptr<descrambler_bb> sptr; + typedef std::shared_ptr<descrambler_bb> sptr; /*! * \brief Make a descrambler block. diff --git a/gr-digital/include/gnuradio/digital/diff_decoder_bb.h b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h index 4cefe3ee34..e92e001dd1 100644 --- a/gr-digital/include/gnuradio/digital/diff_decoder_bb.h +++ b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h @@ -29,7 +29,7 @@ class DIGITAL_API diff_decoder_bb : virtual public sync_block { public: // gr::digital::diff_decoder_bb::sptr - typedef boost::shared_ptr<diff_decoder_bb> sptr; + typedef std::shared_ptr<diff_decoder_bb> sptr; /*! * Make a differential decoder block. diff --git a/gr-digital/include/gnuradio/digital/diff_encoder_bb.h b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h index e5aed700f1..183be32873 100644 --- a/gr-digital/include/gnuradio/digital/diff_encoder_bb.h +++ b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h @@ -29,7 +29,7 @@ class DIGITAL_API diff_encoder_bb : virtual public sync_block { public: // gr::digital::diff_encoder_bb::sptr - typedef boost::shared_ptr<diff_encoder_bb> sptr; + typedef std::shared_ptr<diff_encoder_bb> sptr; /*! * Make a differential encoder block. diff --git a/gr-digital/include/gnuradio/digital/diff_phasor_cc.h b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h index 90197b8ecb..a221df3f85 100644 --- a/gr-digital/include/gnuradio/digital/diff_phasor_cc.h +++ b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h @@ -31,7 +31,7 @@ class DIGITAL_API diff_phasor_cc : virtual public sync_block { public: // gr::digital::diff_phasor_cc::sptr - typedef boost::shared_ptr<diff_phasor_cc> sptr; + typedef std::shared_ptr<diff_phasor_cc> sptr; /*! * Make a differential phasor decoding block. diff --git a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h index 4bce4f8f71..66f348f6d7 100644 --- a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h +++ b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h @@ -73,7 +73,7 @@ class DIGITAL_API fll_band_edge_cc : virtual public sync_block, { public: // gr::digital::fll_band_edge_cc::sptr - typedef boost::shared_ptr<fll_band_edge_cc> sptr; + typedef std::shared_ptr<fll_band_edge_cc> sptr; /*! * Make an FLL block. diff --git a/gr-digital/include/gnuradio/digital/framer_sink_1.h b/gr-digital/include/gnuradio/digital/framer_sink_1.h index 2fc791eeda..1a9cfb993a 100644 --- a/gr-digital/include/gnuradio/digital/framer_sink_1.h +++ b/gr-digital/include/gnuradio/digital/framer_sink_1.h @@ -40,7 +40,7 @@ class DIGITAL_API framer_sink_1 : virtual public sync_block { public: // gr::digital::framer_sink_1::sptr - typedef boost::shared_ptr<framer_sink_1> sptr; + typedef std::shared_ptr<framer_sink_1> sptr; /*! * Make a framer_sink_1 block. diff --git a/gr-digital/include/gnuradio/digital/glfsr_source_b.h b/gr-digital/include/gnuradio/digital/glfsr_source_b.h index fb6068a639..eb5b49e5db 100644 --- a/gr-digital/include/gnuradio/digital/glfsr_source_b.h +++ b/gr-digital/include/gnuradio/digital/glfsr_source_b.h @@ -25,7 +25,7 @@ class DIGITAL_API glfsr_source_b : virtual public sync_block { public: // gr::digital::glfsr_source_b::sptr - typedef boost::shared_ptr<glfsr_source_b> sptr; + typedef std::shared_ptr<glfsr_source_b> sptr; /*! * Make a Galois LFSR pseudo-random source block. diff --git a/gr-digital/include/gnuradio/digital/glfsr_source_f.h b/gr-digital/include/gnuradio/digital/glfsr_source_f.h index 94d16e0334..adc0a8d4f2 100644 --- a/gr-digital/include/gnuradio/digital/glfsr_source_f.h +++ b/gr-digital/include/gnuradio/digital/glfsr_source_f.h @@ -25,7 +25,7 @@ class DIGITAL_API glfsr_source_f : virtual public sync_block { public: // gr::digital::glfsr_source_f::sptr - typedef boost::shared_ptr<glfsr_source_f> sptr; + typedef std::shared_ptr<glfsr_source_f> sptr; /*! * Make a Galois LFSR pseudo-random source block. diff --git a/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h index f70cdc5edd..fd20f294ad 100644 --- a/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h +++ b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h @@ -27,7 +27,7 @@ namespace digital { class DIGITAL_API hdlc_deframer_bp : virtual public gr::sync_block { public: - typedef boost::shared_ptr<hdlc_deframer_bp> sptr; + typedef std::shared_ptr<hdlc_deframer_bp> sptr; /*! * \brief Return a shared_ptr to a new instance of digital::hdlc_deframer. diff --git a/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h index 9b3f2ba8dd..af852517ae 100644 --- a/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h +++ b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h @@ -36,7 +36,7 @@ namespace digital { class DIGITAL_API hdlc_framer_pb : virtual public gr::sync_block { public: - typedef boost::shared_ptr<hdlc_framer_pb> sptr; + typedef std::shared_ptr<hdlc_framer_pb> sptr; /*! * \brief Return a shared_ptr to a new instance of digital::hdlc_framer. diff --git a/gr-digital/include/gnuradio/digital/header_format_base.h b/gr-digital/include/gnuradio/digital/header_format_base.h index 0a3fb7c729..18b4669cef 100644 --- a/gr-digital/include/gnuradio/digital/header_format_base.h +++ b/gr-digital/include/gnuradio/digital/header_format_base.h @@ -14,7 +14,6 @@ #include <gnuradio/digital/header_buffer.h> #include <gnuradio/logger.h> #include <pmt/pmt.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -109,10 +108,10 @@ namespace digital { * \sa header_format_counter */ class DIGITAL_API header_format_base - : public boost::enable_shared_from_this<gr::digital::header_format_base> + : public std::enable_shared_from_this<gr::digital::header_format_base> { public: - typedef boost::shared_ptr<header_format_base> sptr; + typedef std::shared_ptr<header_format_base> sptr; header_format_base(); virtual ~header_format_base(); diff --git a/gr-digital/include/gnuradio/digital/header_format_default.h b/gr-digital/include/gnuradio/digital/header_format_default.h index 8170bbc835..402b5efee1 100644 --- a/gr-digital/include/gnuradio/digital/header_format_default.h +++ b/gr-digital/include/gnuradio/digital/header_format_default.h @@ -15,7 +15,6 @@ #include <gnuradio/digital/header_format_base.h> #include <gnuradio/logger.h> #include <pmt/pmt.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { diff --git a/gr-digital/include/gnuradio/digital/header_payload_demux.h b/gr-digital/include/gnuradio/digital/header_payload_demux.h index 8797cb9801..a1f41c3872 100644 --- a/gr-digital/include/gnuradio/digital/header_payload_demux.h +++ b/gr-digital/include/gnuradio/digital/header_payload_demux.h @@ -150,7 +150,7 @@ namespace digital { class DIGITAL_API header_payload_demux : virtual public block { public: - typedef boost::shared_ptr<header_payload_demux> sptr; + typedef std::shared_ptr<header_payload_demux> sptr; /*! * \param header_len Number of symbols per header diff --git a/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h index ccfcf1b56e..dde885585a 100644 --- a/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h @@ -36,7 +36,7 @@ protected: public: // gr::digital::kurtotic_equalizer_cc::sptr - typedef boost::shared_ptr<kurtotic_equalizer_cc> sptr; + typedef std::shared_ptr<kurtotic_equalizer_cc> sptr; static sptr make(int num_taps, float mu); diff --git a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h index 309ea80b59..9c187e165c 100644 --- a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h @@ -60,7 +60,7 @@ protected: public: // gr::digital::lms_dd_equalizer_cc::sptr - typedef boost::shared_ptr<lms_dd_equalizer_cc> sptr; + typedef std::shared_ptr<lms_dd_equalizer_cc> sptr; /*! * Make an LMS decision-directed equalizer diff --git a/gr-digital/include/gnuradio/digital/map_bb.h b/gr-digital/include/gnuradio/digital/map_bb.h index 16fc0c4836..40150b8727 100644 --- a/gr-digital/include/gnuradio/digital/map_bb.h +++ b/gr-digital/include/gnuradio/digital/map_bb.h @@ -32,7 +32,7 @@ class DIGITAL_API map_bb : virtual public sync_block { public: // gr::digital::map_bb::sptr - typedef boost::shared_ptr<map_bb> sptr; + typedef std::shared_ptr<map_bb> sptr; /*! * Make a map block. diff --git a/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h index 5391ea639a..61d24cee44 100644 --- a/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h +++ b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h @@ -41,7 +41,7 @@ class DIGITAL_API mpsk_snr_est_cc : virtual public sync_block { public: // gr::digital::mpsk_snr_est_cc::sptr - typedef boost::shared_ptr<mpsk_snr_est_cc> sptr; + typedef std::shared_ptr<mpsk_snr_est_cc> sptr; /*! Factory function returning shared pointer of this class * diff --git a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h index db0818d868..7dbc618ad7 100644 --- a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h +++ b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h @@ -34,7 +34,7 @@ namespace digital { class DIGITAL_API msk_timing_recovery_cc : virtual public gr::block { public: - typedef boost::shared_ptr<msk_timing_recovery_cc> sptr; + typedef std::shared_ptr<msk_timing_recovery_cc> sptr; /*! * \brief Make an MSK timing recovery block. diff --git a/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h index 3058f5296e..130a3e21c2 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h @@ -59,7 +59,7 @@ namespace digital { class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_carrier_allocator_cvc> sptr; + typedef std::shared_ptr<ofdm_carrier_allocator_cvc> sptr; virtual std::string len_tag_key() = 0; virtual const int fft_len() = 0; diff --git a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h index e27a73343f..259215b020 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h @@ -45,7 +45,7 @@ namespace digital { class DIGITAL_API ofdm_chanest_vcvc : virtual public block { public: - typedef boost::shared_ptr<ofdm_chanest_vcvc> sptr; + typedef std::shared_ptr<ofdm_chanest_vcvc> sptr; /*! * \param sync_symbol1 First synchronisation symbol in the frequency domain. Its diff --git a/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h index 87f4f8bfdb..81bea6980c 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h +++ b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h @@ -50,7 +50,7 @@ namespace digital { class DIGITAL_API ofdm_cyclic_prefixer : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_cyclic_prefixer> sptr; + typedef std::shared_ptr<ofdm_cyclic_prefixer> sptr; /*! * \param input_size IFFT length (i.e. length of the OFDM symbols). diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h index e6b98a1d11..328523295f 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h @@ -13,7 +13,6 @@ #include <gnuradio/digital/api.h> #include <gnuradio/gr_complex.h> #include <gnuradio/tags.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -24,13 +23,13 @@ namespace digital { * \ingroup equalizers_blk */ class DIGITAL_API ofdm_equalizer_base - : public boost::enable_shared_from_this<ofdm_equalizer_base> + : public std::enable_shared_from_this<ofdm_equalizer_base> { protected: int d_fft_len; public: - typedef boost::shared_ptr<ofdm_equalizer_base> sptr; + typedef std::shared_ptr<ofdm_equalizer_base> sptr; ofdm_equalizer_base(int fft_len); virtual ~ofdm_equalizer_base(); @@ -76,7 +75,7 @@ protected: std::vector<gr_complex> d_channel_state; public: - typedef boost::shared_ptr<ofdm_equalizer_1d_pilots> sptr; + typedef std::shared_ptr<ofdm_equalizer_1d_pilots> sptr; ofdm_equalizer_1d_pilots(int fft_len, const std::vector<std::vector<int>>& occupied_carriers, diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h index d07cf709cd..54c9c43fea 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h @@ -52,7 +52,7 @@ namespace digital { class DIGITAL_API ofdm_equalizer_simpledfe : public ofdm_equalizer_1d_pilots { public: - typedef boost::shared_ptr<ofdm_equalizer_simpledfe> sptr; + typedef std::shared_ptr<ofdm_equalizer_simpledfe> sptr; ofdm_equalizer_simpledfe(int fft_len, const gr::digital::constellation_sptr& constellation, diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h index af5d85d550..39ef12e793 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h @@ -34,7 +34,7 @@ namespace digital { class DIGITAL_API ofdm_equalizer_static : public ofdm_equalizer_1d_pilots { public: - typedef boost::shared_ptr<ofdm_equalizer_static> sptr; + typedef std::shared_ptr<ofdm_equalizer_static> sptr; ofdm_equalizer_static(int fft_len, const std::vector<std::vector<int>>& occupied_carriers = diff --git a/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h index df1169a573..9d92d2d876 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h @@ -41,7 +41,7 @@ namespace digital { class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_frame_equalizer_vcvc> sptr; + typedef std::shared_ptr<ofdm_frame_equalizer_vcvc> sptr; /*! * \param equalizer The equalizer object that will do the actual work diff --git a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h index 5da437e78e..aec42b290c 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h @@ -43,7 +43,7 @@ namespace digital { class DIGITAL_API ofdm_serializer_vcc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_serializer_vcc> sptr; + typedef std::shared_ptr<ofdm_serializer_vcc> sptr; /*! * \param fft_len FFT length diff --git a/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h index f2909c57bd..2fe18b1215 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h +++ b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h @@ -52,7 +52,7 @@ namespace digital { class DIGITAL_API ofdm_sync_sc_cfb : virtual public hier_block2 { public: - typedef boost::shared_ptr<ofdm_sync_sc_cfb> sptr; + typedef std::shared_ptr<ofdm_sync_sc_cfb> sptr; /*! \param fft_len FFT length * \param cp_len Length of the guard interval (cyclic prefix) in samples diff --git a/gr-digital/include/gnuradio/digital/packet_header_default.h b/gr-digital/include/gnuradio/digital/packet_header_default.h index f6d90bd0e6..24ec1a1f05 100644 --- a/gr-digital/include/gnuradio/digital/packet_header_default.h +++ b/gr-digital/include/gnuradio/digital/packet_header_default.h @@ -13,7 +13,6 @@ #include <gnuradio/digital/api.h> #include <gnuradio/tags.h> #include <boost/crc.hpp> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -35,10 +34,10 @@ namespace digital { * this class to create packet headers from data streams. */ class DIGITAL_API packet_header_default - : public boost::enable_shared_from_this<gr::digital::packet_header_default> + : public std::enable_shared_from_this<gr::digital::packet_header_default> { public: - typedef boost::shared_ptr<packet_header_default> sptr; + typedef std::shared_ptr<packet_header_default> sptr; packet_header_default(long header_len, const std::string& len_tag_key = "packet_len", diff --git a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h index 184c1abf4f..7599849f70 100644 --- a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h +++ b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h @@ -24,7 +24,7 @@ namespace digital { class DIGITAL_API packet_header_ofdm : public packet_header_default { public: - typedef boost::shared_ptr<packet_header_ofdm> sptr; + typedef std::shared_ptr<packet_header_ofdm> sptr; packet_header_ofdm(const std::vector<std::vector<int>>& occupied_carriers, int n_syms, diff --git a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h index f99cb4d72f..84e5f7c0f3 100644 --- a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h +++ b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h @@ -32,7 +32,7 @@ namespace digital { class DIGITAL_API packet_headergenerator_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<packet_headergenerator_bb> sptr; + typedef std::shared_ptr<packet_headergenerator_bb> sptr; /* \param header_formatter A header formatter object. * \param len_tag_key Length tag key. Note that for header generation, diff --git a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h index adec96b13f..386d3953c1 100644 --- a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h +++ b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h @@ -37,7 +37,7 @@ namespace digital { class DIGITAL_API packet_headerparser_b : virtual public sync_block { public: - typedef boost::shared_ptr<packet_headerparser_b> sptr; + typedef std::shared_ptr<packet_headerparser_b> sptr; /*! * \param header_formatter Header object. This should be the same as used for diff --git a/gr-digital/include/gnuradio/digital/packet_sink.h b/gr-digital/include/gnuradio/digital/packet_sink.h index e91bc35755..744ec3165f 100644 --- a/gr-digital/include/gnuradio/digital/packet_sink.h +++ b/gr-digital/include/gnuradio/digital/packet_sink.h @@ -45,7 +45,7 @@ class DIGITAL_API packet_sink : virtual public sync_block { public: // gr::digital::packet_sink::sptr - typedef boost::shared_ptr<packet_sink> sptr; + typedef std::shared_ptr<packet_sink> sptr; /*! * Make a packet_sink block. diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h index 4785526d91..3357c48c7c 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h @@ -145,7 +145,7 @@ class DIGITAL_API pfb_clock_sync_ccf : virtual public block { public: // gr::digital::pfb_clock_sync_ccf::sptr - typedef boost::shared_ptr<pfb_clock_sync_ccf> sptr; + typedef std::shared_ptr<pfb_clock_sync_ccf> sptr; /*! * Build the polyphase filterbank timing synchronizer. diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h index c06ac77302..757d3f2264 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h @@ -144,7 +144,7 @@ class DIGITAL_API pfb_clock_sync_fff : virtual public block { public: // gr::digital::pfb_clock_sync_fff::sptr - typedef boost::shared_ptr<pfb_clock_sync_fff> sptr; + typedef std::shared_ptr<pfb_clock_sync_fff> sptr; /*! * Build the polyphase filterbank timing synchronizer. diff --git a/gr-digital/include/gnuradio/digital/pn_correlator_cc.h b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h index 0453b16ef4..c94f1530bb 100644 --- a/gr-digital/include/gnuradio/digital/pn_correlator_cc.h +++ b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h @@ -30,7 +30,7 @@ class DIGITAL_API pn_correlator_cc : virtual public sync_decimator { public: // gr::digital::pn_correlator_cc::sptr - typedef boost::shared_ptr<pn_correlator_cc> sptr; + typedef std::shared_ptr<pn_correlator_cc> sptr; /*! * \brief Make PN code sequential search correlator block. diff --git a/gr-digital/include/gnuradio/digital/probe_density_b.h b/gr-digital/include/gnuradio/digital/probe_density_b.h index 16f2a26cc1..2f8afe0f0c 100644 --- a/gr-digital/include/gnuradio/digital/probe_density_b.h +++ b/gr-digital/include/gnuradio/digital/probe_density_b.h @@ -29,7 +29,7 @@ class DIGITAL_API probe_density_b : virtual public sync_block { public: // gr::digital::probe_density_b::sptr - typedef boost::shared_ptr<probe_density_b> sptr; + typedef std::shared_ptr<probe_density_b> sptr; /*! * Make a density probe block. diff --git a/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h index 83cd4aaa03..c56ffc2771 100644 --- a/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h +++ b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h @@ -48,7 +48,7 @@ class DIGITAL_API probe_mpsk_snr_est_c : virtual public sync_block { public: // gr::digital::probe_mpsk_snr_est_c::sptr - typedef boost::shared_ptr<probe_mpsk_snr_est_c> sptr; + typedef std::shared_ptr<probe_mpsk_snr_est_c> sptr; /*! Make an MPSK SNR probe. * diff --git a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h index b4a4bdf759..41ed4b4c9c 100644 --- a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h +++ b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h @@ -59,7 +59,7 @@ namespace digital { class DIGITAL_API protocol_formatter_async : virtual public block { public: - typedef boost::shared_ptr<protocol_formatter_async> sptr; + typedef std::shared_ptr<protocol_formatter_async> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h index 13cc53e22b..602b4f0b5d 100644 --- a/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h +++ b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h @@ -47,7 +47,7 @@ namespace digital { class DIGITAL_API protocol_formatter_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<protocol_formatter_bb> sptr; + typedef std::shared_ptr<protocol_formatter_bb> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/protocol_parser_b.h b/gr-digital/include/gnuradio/digital/protocol_parser_b.h index ba025997c4..fabaa8a77b 100644 --- a/gr-digital/include/gnuradio/digital/protocol_parser_b.h +++ b/gr-digital/include/gnuradio/digital/protocol_parser_b.h @@ -51,7 +51,7 @@ namespace digital { class DIGITAL_API protocol_parser_b : virtual public sync_block { public: - typedef boost::shared_ptr<protocol_parser_b> sptr; + typedef std::shared_ptr<protocol_parser_b> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/scrambler_bb.h b/gr-digital/include/gnuradio/digital/scrambler_bb.h index c9ad2cad9e..51f43b3bc8 100644 --- a/gr-digital/include/gnuradio/digital/scrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/scrambler_bb.h @@ -30,7 +30,7 @@ class DIGITAL_API scrambler_bb : virtual public sync_block { public: // gr::digital::scrambler_bb::sptr - typedef boost::shared_ptr<scrambler_bb> sptr; + typedef std::shared_ptr<scrambler_bb> sptr; /*! * Make a scramber block. diff --git a/gr-digital/include/gnuradio/digital/simple_correlator.h b/gr-digital/include/gnuradio/digital/simple_correlator.h index 740820f5c2..e59c0aa05b 100644 --- a/gr-digital/include/gnuradio/digital/simple_correlator.h +++ b/gr-digital/include/gnuradio/digital/simple_correlator.h @@ -26,7 +26,7 @@ class DIGITAL_API simple_correlator : virtual public block { public: // gr::digital::simple_correlator::sptr - typedef boost::shared_ptr<simple_correlator> sptr; + typedef std::shared_ptr<simple_correlator> sptr; static sptr make(int payload_bytesize); }; diff --git a/gr-digital/include/gnuradio/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h index 6bf7535156..778ef7f14f 100644 --- a/gr-digital/include/gnuradio/digital/simple_framer.h +++ b/gr-digital/include/gnuradio/digital/simple_framer.h @@ -31,7 +31,7 @@ class DIGITAL_API simple_framer : virtual public block { public: // gr::digital::simple_framer::sptr - typedef boost::shared_ptr<simple_framer> sptr; + typedef std::shared_ptr<simple_framer> sptr; /*! * Make a simple_framer block. diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h index 36fe2d7bfa..af65940b41 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h @@ -44,7 +44,7 @@ class DIGITAL_API symbol_sync_cc : virtual public block { public: // gr::digital::symbol_sync_cc::sptr - typedef boost::shared_ptr<symbol_sync_cc> sptr; + typedef std::shared_ptr<symbol_sync_cc> sptr; /*! * Make a Symbol Synchronizer block. diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h index c725fb4c93..b8c1716d5a 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h @@ -44,7 +44,7 @@ class DIGITAL_API symbol_sync_ff : virtual public block { public: // gr::digital::symbol_sync_ff::sptr - typedef boost::shared_ptr<symbol_sync_ff> sptr; + typedef std::shared_ptr<symbol_sync_ff> sptr; /*! * Make a Symbol Synchronizer block. |