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-trellis/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-trellis/include')
14 files changed, 14 insertions, 14 deletions
diff --git a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h index 5131fb5256..ab8f3bef39 100644 --- a/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h +++ b/gr-trellis/include/gnuradio/trellis/constellation_metrics_cf.h @@ -27,7 +27,7 @@ class TRELLIS_API constellation_metrics_cf : virtual public block { public: // gr::trellis::constellation_metrics_cf::sptr - typedef boost::shared_ptr<constellation_metrics_cf> sptr; + typedef std::shared_ptr<constellation_metrics_cf> sptr; static sptr make(digital::constellation_sptr constellation, digital::trellis_metric_type_t TYPE); diff --git a/gr-trellis/include/gnuradio/trellis/encoder.h b/gr-trellis/include/gnuradio/trellis/encoder.h index 844a075ef8..1e573d935f 100644 --- a/gr-trellis/include/gnuradio/trellis/encoder.h +++ b/gr-trellis/include/gnuradio/trellis/encoder.h @@ -27,7 +27,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API encoder : virtual public sync_block { public: - typedef boost::shared_ptr<encoder<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<encoder<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSM, int ST); diff --git a/gr-trellis/include/gnuradio/trellis/metrics.h b/gr-trellis/include/gnuradio/trellis/metrics.h index c0a5f4a784..024e4bf311 100644 --- a/gr-trellis/include/gnuradio/trellis/metrics.h +++ b/gr-trellis/include/gnuradio/trellis/metrics.h @@ -29,7 +29,7 @@ class TRELLIS_API metrics : virtual public block { public: // gr::trellis::metrics::sptr - typedef boost::shared_ptr<metrics<T>> sptr; + typedef std::shared_ptr<metrics<T>> sptr; static sptr make(int O, int D, const std::vector<T>& TABLE, digital::trellis_metric_type_t TYPE); diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h index e3688bec27..13dcca559e 100644 --- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_blk.h @@ -31,7 +31,7 @@ class TRELLIS_API pccc_decoder_blk : virtual public block { public: // gr::trellis::pccc_decoder_blk::sptr - typedef boost::shared_ptr<pccc_decoder_blk<T>> sptr; + typedef std::shared_ptr<pccc_decoder_blk<T>> sptr; static sptr make(const fsm& FSM1, int ST10, diff --git a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h index ca48f2cd9b..d643373da6 100644 --- a/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h +++ b/gr-trellis/include/gnuradio/trellis/pccc_decoder_combined_blk.h @@ -30,7 +30,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API pccc_decoder_combined_blk : virtual public block { public: - typedef boost::shared_ptr<pccc_decoder_combined_blk<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<pccc_decoder_combined_blk<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSMo, int STo0, diff --git a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h index ec25034457..e0fb29ee23 100644 --- a/gr-trellis/include/gnuradio/trellis/pccc_encoder.h +++ b/gr-trellis/include/gnuradio/trellis/pccc_encoder.h @@ -29,7 +29,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API pccc_encoder : virtual public sync_block { public: - typedef boost::shared_ptr<pccc_encoder<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<pccc_encoder<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSM1, int ST1, diff --git a/gr-trellis/include/gnuradio/trellis/permutation.h b/gr-trellis/include/gnuradio/trellis/permutation.h index 5c84e88f88..9bc748aef9 100644 --- a/gr-trellis/include/gnuradio/trellis/permutation.h +++ b/gr-trellis/include/gnuradio/trellis/permutation.h @@ -26,7 +26,7 @@ class TRELLIS_API permutation : virtual public sync_block { public: // gr::trellis::permutation::sptr - typedef boost::shared_ptr<permutation> sptr; + typedef std::shared_ptr<permutation> sptr; static sptr make(int K, const std::vector<int>& TABLE, int SYMS_PER_BLOCK, size_t NBYTES); diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h index f3c89440e3..d3febffe29 100644 --- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_blk.h @@ -31,7 +31,7 @@ class TRELLIS_API sccc_decoder_blk : virtual public block { public: // gr::trellis::sccc_decoder_blk::sptr - typedef boost::shared_ptr<sccc_decoder_blk<T>> sptr; + typedef std::shared_ptr<sccc_decoder_blk<T>> sptr; static sptr make(const fsm& FSMo, int STo0, diff --git a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h index 4c88407a6e..820f0bc572 100644 --- a/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h +++ b/gr-trellis/include/gnuradio/trellis/sccc_decoder_combined_blk.h @@ -30,7 +30,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API sccc_decoder_combined_blk : virtual public block { public: - typedef boost::shared_ptr<sccc_decoder_combined_blk<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<sccc_decoder_combined_blk<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSMo, int STo0, diff --git a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h index 1c872142c7..b7dfc86d26 100644 --- a/gr-trellis/include/gnuradio/trellis/sccc_encoder.h +++ b/gr-trellis/include/gnuradio/trellis/sccc_encoder.h @@ -28,7 +28,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API sccc_encoder : virtual public sync_block { public: - typedef boost::shared_ptr<sccc_encoder<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<sccc_encoder<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSMo, int STo, diff --git a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h index b43d48fa96..f6c005544d 100644 --- a/gr-trellis/include/gnuradio/trellis/siso_combined_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_combined_f.h @@ -28,7 +28,7 @@ class TRELLIS_API siso_combined_f : virtual public block { public: // gr::trellis::siso_combined_f::sptr - typedef boost::shared_ptr<siso_combined_f> sptr; + typedef std::shared_ptr<siso_combined_f> sptr; static sptr make(const fsm& FSM, int K, diff --git a/gr-trellis/include/gnuradio/trellis/siso_f.h b/gr-trellis/include/gnuradio/trellis/siso_f.h index a0f7a5ea6f..014e0cea00 100644 --- a/gr-trellis/include/gnuradio/trellis/siso_f.h +++ b/gr-trellis/include/gnuradio/trellis/siso_f.h @@ -27,7 +27,7 @@ class TRELLIS_API siso_f : virtual public block { public: // gr::trellis::siso_f::sptr - typedef boost::shared_ptr<siso_f> sptr; + typedef std::shared_ptr<siso_f> sptr; static sptr make(const fsm& FSM, int K, diff --git a/gr-trellis/include/gnuradio/trellis/viterbi.h b/gr-trellis/include/gnuradio/trellis/viterbi.h index 8f63bd2544..56ac3c4ea1 100644 --- a/gr-trellis/include/gnuradio/trellis/viterbi.h +++ b/gr-trellis/include/gnuradio/trellis/viterbi.h @@ -29,7 +29,7 @@ class TRELLIS_API viterbi : virtual public block { public: // gr::trellis::viterbi::sptr - typedef boost::shared_ptr<viterbi<T>> sptr; + typedef std::shared_ptr<viterbi<T>> sptr; static sptr make(const fsm& FSM, int K, int S0, int SK); diff --git a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h index cf045b20de..e4a4267fe4 100644 --- a/gr-trellis/include/gnuradio/trellis/viterbi_combined.h +++ b/gr-trellis/include/gnuradio/trellis/viterbi_combined.h @@ -28,7 +28,7 @@ template <class IN_T, class OUT_T> class TRELLIS_API viterbi_combined : virtual public block { public: - typedef boost::shared_ptr<viterbi_combined<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<viterbi_combined<IN_T, OUT_T>> sptr; static sptr make(const fsm& FSM, int K, |