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-qtgui | |
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-qtgui')
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/number_sink.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h index c3a4a713ad..71e7f3e6d7 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h @@ -27,7 +27,7 @@ class QTGUI_API ber_sink_b : virtual public block { public: // gr::fec::ber_sink_b::sptr - typedef boost::shared_ptr<ber_sink_b> sptr; + typedef std::shared_ptr<ber_sink_b> sptr; static sptr make(std::vector<float> esnos, int curves = 1, diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index a2d557b283..c70fe04cdc 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -48,7 +48,7 @@ class QTGUI_API const_sink_c : virtual public sync_block { public: // gr::qtgui::const_sink_c::sptr - typedef boost::shared_ptr<const_sink_c> sptr; + typedef std::shared_ptr<const_sink_c> sptr; /*! * \brief Build a constellation plot sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h index 76ea63513f..d05a690324 100644 --- a/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h +++ b/gr-qtgui/include/gnuradio/qtgui/edit_box_msg.h @@ -96,7 +96,7 @@ class QTGUI_API edit_box_msg : virtual public block { public: // gr::qtgui::edit_box_msg::sptr - typedef boost::shared_ptr<edit_box_msg> sptr; + typedef std::shared_ptr<edit_box_msg> sptr; /*! * \brief Constructs the Edit box block. diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index f1deebc137..4d832252c8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -75,7 +75,7 @@ class QTGUI_API freq_sink_c : virtual public sync_block { public: // gr::qtgui::freq_sink_c::sptr - typedef boost::shared_ptr<freq_sink_c> sptr; + typedef std::shared_ptr<freq_sink_c> sptr; /*! * \brief Build a complex PSD sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index ccac35e849..701ff94369 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -75,7 +75,7 @@ class QTGUI_API freq_sink_f : virtual public sync_block { public: // gr::qtgui::freq_sink_f::sptr - typedef boost::shared_ptr<freq_sink_f> sptr; + typedef std::shared_ptr<freq_sink_f> sptr; /*! * \brief Build a floating point PSD sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 800d5b3240..34571e3eb4 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -64,7 +64,7 @@ class QTGUI_API histogram_sink_f : virtual public sync_block { public: // gr::qtgui::histogram_sink_f::sptr - typedef boost::shared_ptr<histogram_sink_f> sptr; + typedef std::shared_ptr<histogram_sink_f> sptr; /*! * \brief Build floating point histogram sink diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index 270a9fc723..20bd20e6cc 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -54,7 +54,7 @@ class QTGUI_API number_sink : virtual public sync_block { public: // gr::qtgui::number_sink::sptr - typedef boost::shared_ptr<number_sink> sptr; + typedef std::shared_ptr<number_sink> sptr; /*! * \brief Build a number sink diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index eee8fdfcad..1e4343ce44 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -59,7 +59,7 @@ class QTGUI_API sink_c : virtual public block { public: // gr::qtgui::sink_c::sptr - typedef boost::shared_ptr<sink_c> sptr; + typedef std::shared_ptr<sink_c> sptr; /*! * \brief Build a complex qtgui sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index c5765b6135..09b0457ea1 100644 --- a/gr-qtgui/include/gnuradio/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -59,7 +59,7 @@ class QTGUI_API sink_f : virtual public block { public: // gr::qtgui::sink_f::sptr - typedef boost::shared_ptr<sink_f> sptr; + typedef std::shared_ptr<sink_f> sptr; /*! * \brief Build a floating point qtgui sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index 7b7a580cd5..7c1c59d202 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -52,7 +52,7 @@ class QTGUI_API time_raster_sink_b : virtual public sync_block { public: // gr::qtgui::time_raster_sink_b::sptr - typedef boost::shared_ptr<time_raster_sink_b> sptr; + typedef std::shared_ptr<time_raster_sink_b> sptr; /*! * \brief Build a bit time raster sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index 0e6a1f2507..0c42d04c0c 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -48,7 +48,7 @@ class QTGUI_API time_raster_sink_f : virtual public sync_block { public: // gr::qtgui::time_raster_sink_f::sptr - typedef boost::shared_ptr<time_raster_sink_f> sptr; + typedef std::shared_ptr<time_raster_sink_f> sptr; /*! * \brief Build a floating point time raster sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index 24dd855b63..30d254d7e0 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -51,7 +51,7 @@ class QTGUI_API time_sink_c : virtual public sync_block { public: // gr::qtgui::time_sink_c::sptr - typedef boost::shared_ptr<time_sink_c> sptr; + typedef std::shared_ptr<time_sink_c> sptr; /*! * \brief Build complex time sink diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index cc18517064..3c9d361096 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -49,7 +49,7 @@ class QTGUI_API time_sink_f : virtual public sync_block { public: // gr::qtgui::time_sink_f::sptr - typedef boost::shared_ptr<time_sink_f> sptr; + typedef std::shared_ptr<time_sink_f> sptr; /*! * \brief Build floating point time sink diff --git a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h index 34148a3291..eb0e68e7c4 100644 --- a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h @@ -42,7 +42,7 @@ class QTGUI_API vector_sink_f : virtual public sync_block { public: // gr::qtgui::vector_sink_f::sptr - typedef boost::shared_ptr<vector_sink_f> sptr; + typedef std::shared_ptr<vector_sink_f> sptr; /*! * \brief Build a vector plotting sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 475ba7283d..5adea84300 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -80,7 +80,7 @@ class QTGUI_API waterfall_sink_c : virtual public sync_block { public: // gr::qtgui::waterfall_sink_c::sptr - typedef boost::shared_ptr<waterfall_sink_c> sptr; + typedef std::shared_ptr<waterfall_sink_c> sptr; /*! * \brief Build a complex waterfall sink. diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 0f79b23cc5..3409829782 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -81,7 +81,7 @@ class QTGUI_API waterfall_sink_f : virtual public sync_block { public: // gr::qtgui::waterfall_sink_f::sptr - typedef boost::shared_ptr<waterfall_sink_f> sptr; + typedef std::shared_ptr<waterfall_sink_f> sptr; /*! * \brief Build a floating point waterfall sink. |