Replace boost::shared_ptr by std::shared_ptr

2025-10-30 14:53:03 +00:00 · 2020-04-02 13:23:20 +02:00
parent 1f62756fdf
commit 5f974a8f17
131 changed files with 372 additions and 372 deletions
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -24,7 +24,7 @@
 #include "concurrent_queue.h"
 #include "fpga_switch.h"
 #include "gnss_block_interface.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <pmt/pmt.h>
 #include <cstdint>
 #include <memory>
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@@ -24,7 +24,7 @@
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
 #include "gr_complex_ip_packet_source.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <pmt/pmt.h>
@@ -86,9 +86,9 @@ private:
    size_t item_size_;
    bool dump_;
    std::string dump_filename_;
-    std::vector<boost::shared_ptr<gr::block>> null_sinks_;
+    std::vector<std::shared_ptr<gr::block>> null_sinks_;
    Gr_Complex_Ip_Packet_Source::sptr udp_gnss_rx_source_;
-    std::vector<boost::shared_ptr<gr::block>> file_sink_;
+    std::vector<std::shared_ptr<gr::block>> file_sink_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };

--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -110,7 +110,7 @@ private:
    uint32_t in_streams_;
    uint32_t out_streams_;
    gr::blocks::file_source::sptr file_source_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    gr::blocks::throttle::sptr throttle_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -96,8 +96,8 @@ private:

    gr::block_sptr flexiband_source_;

-    std::vector<boost::shared_ptr<gr::block>> char_to_float;
-    std::vector<boost::shared_ptr<gr::block>> float_to_complex_;
+    std::vector<std::shared_ptr<gr::block>> char_to_float;
+    std::vector<std::shared_ptr<gr::block>> float_to_complex_;
    std::vector<gr::blocks::null_sink::sptr> null_sinks_;

    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@@ -23,7 +23,7 @@
 #define GNSS_SDR_FMCOMMS2_SIGNAL_SOURCE_H

 #include "gnss_block_interface.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/file_sink.h>
 #if GRIIO_INCLUDE_HAS_GNURADIO
 #include <gnuradio/iio/fmcomms2_source.h>
@@ -118,7 +118,7 @@ private:

    gr::iio::fmcomms2_source_f32c::sptr fmcomms2_source_f32c_;

-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr file_sink_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
--- a/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/multichannel_file_signal_source.h
@@ -110,7 +110,7 @@ private:
    uint32_t in_streams_;
    uint32_t out_streams_;
    std::vector<gr::blocks::file_source::sptr> file_source_vec_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    std::vector<gr::blocks::throttle::sptr> throttle_vec_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -110,7 +110,7 @@ private:
    uint32_t out_streams_;
    gr::blocks::file_source::sptr file_source_;
    unpack_byte_2bit_samples_sptr unpack_byte_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    gr::blocks::throttle::sptr throttle_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -24,7 +24,7 @@

 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/file_sink.h>
 #include <pmt/pmt.h>
 #include <cstdint>
@@ -99,7 +99,7 @@ private:

    std::string antenna_;

-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr file_sink_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@@ -22,7 +22,7 @@
 #define GNSS_SDR_PLUTOSDR_SIGNAL_SOURCE_H

 #include "gnss_block_interface.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/file_sink.h>
 #if GRIIO_INCLUDE_HAS_GNURADIO
 #include <gnuradio/iio/pluto_source.h>
@@ -103,7 +103,7 @@ private:

    gr::iio::pluto_source::sptr plutosdr_source_;

-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr file_sink_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -24,7 +24,7 @@
 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
 #include "rtl_tcp_signal_source_c.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/deinterleave.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/float_to_complex.h>
@@ -102,7 +102,7 @@ private:

    rtl_tcp_signal_source_c_sptr signal_source_;

-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr file_sink_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -108,7 +108,7 @@ private:
    unsigned int out_streams_;
    gr::blocks::file_source::sptr file_source_;
    unpack_intspir_1bit_samples_sptr unpack_intspir_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    gr::blocks::throttle::sptr throttle_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
@@ -119,7 +119,7 @@ private:
    std::vector<gr::blocks::endian_swap::sptr> endian_vec_;
    std::vector<gr::blocks::null_sink::sptr> null_sinks_;
    std::vector<unpack_spir_gss6450_samples_sptr> unpack_spir_vec_;
-    std::vector<boost::shared_ptr<gr::block>> valve_vec_;
+    std::vector<std::shared_ptr<gr::block>> valve_vec_;
    std::vector<gr::blocks::file_sink::sptr> sink_vec_;
    std::vector<gr::blocks::throttle::sptr> throttle_vec_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.h
@@ -115,7 +115,7 @@ private:
    gr::blocks::file_source::sptr file_source_;
    unpack_byte_2bit_cpx_samples_sptr unpack_byte_;
    gr::blocks::interleaved_short_to_complex::sptr inter_shorts_to_cpx_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    gr::blocks::throttle::sptr throttle_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.h
@@ -134,7 +134,7 @@ private:
    gr::blocks::file_source::sptr file_source_;
    unpack_2bit_samples_sptr unpack_samples_;
    gr::basic_block_sptr char_to_float_;
-    boost::shared_ptr<gr::block> valve_;
+    std::shared_ptr<gr::block> valve_;
    gr::blocks::file_sink::sptr sink_;
    gr::blocks::throttle::sptr throttle_;
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -22,7 +22,7 @@

 #include "concurrent_queue.h"
 #include "gnss_block_interface.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/uhd/usrp_source.h>
@@ -95,7 +95,7 @@ private:
    std::vector<bool> dump_;
    std::vector<std::string> dump_filename_;

-    std::vector<boost::shared_ptr<gr::block>> valve_;
+    std::vector<std::shared_ptr<gr::block>> valve_;
    std::vector<gr::blocks::file_sink::sptr> file_sink_;

    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -35,7 +35,7 @@
 class Gr_Complex_Ip_Packet_Source : virtual public gr::sync_block
 {
 public:
-    typedef boost::shared_ptr<Gr_Complex_Ip_Packet_Source> sptr;
+    typedef std::shared_ptr<Gr_Complex_Ip_Packet_Source> sptr;
    static sptr make(std::string src_device,
        const std::string &origin_address,
        int udp_port,
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
@@ -31,7 +31,7 @@

 class labsat23_source;

-using labsat23_source_sptr = boost::shared_ptr<labsat23_source>;
+using labsat23_source_sptr = std::shared_ptr<labsat23_source>;

 labsat23_source_sptr labsat23_make_source_sptr(
    const char *signal_file_basename,
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -40,7 +40,7 @@

 class rtl_tcp_signal_source_c;

-using rtl_tcp_signal_source_c_sptr = boost::shared_ptr<rtl_tcp_signal_source_c>;
+using rtl_tcp_signal_source_c_sptr = std::shared_ptr<rtl_tcp_signal_source_c>;

 #if BOOST_GREATER_1_65
 using b_io_context = boost::asio::io_context;
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -63,7 +63,7 @@

 class unpack_2bit_samples;

-using unpack_2bit_samples_sptr = boost::shared_ptr<unpack_2bit_samples>;
+using unpack_2bit_samples_sptr = std::shared_ptr<unpack_2bit_samples>;

 unpack_2bit_samples_sptr make_unpack_2bit_samples(
    bool big_endian_bytes,
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
@@ -28,7 +28,7 @@

 class unpack_byte_2bit_cpx_samples;

-using unpack_byte_2bit_cpx_samples_sptr = boost::shared_ptr<unpack_byte_2bit_cpx_samples>;
+using unpack_byte_2bit_cpx_samples_sptr = std::shared_ptr<unpack_byte_2bit_cpx_samples>;

 unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples();

--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
@@ -24,7 +24,7 @@

 class unpack_byte_2bit_samples;

-using unpack_byte_2bit_samples_sptr = boost::shared_ptr<unpack_byte_2bit_samples>;
+using unpack_byte_2bit_samples_sptr = std::shared_ptr<unpack_byte_2bit_samples>;

 unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples();

--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -26,7 +26,7 @@

 class unpack_byte_4bit_samples;

-using unpack_byte_4bit_samples_sptr = boost::shared_ptr<unpack_byte_4bit_samples>;
+using unpack_byte_4bit_samples_sptr = std::shared_ptr<unpack_byte_4bit_samples>;

 unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples();

--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
@@ -24,7 +24,7 @@

 class unpack_intspir_1bit_samples;

-using unpack_intspir_1bit_samples_sptr = boost::shared_ptr<unpack_intspir_1bit_samples>;
+using unpack_intspir_1bit_samples_sptr = std::shared_ptr<unpack_intspir_1bit_samples>;

 unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples();

--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
@@ -25,7 +25,7 @@

 class unpack_spir_gss6450_samples;

-using unpack_spir_gss6450_samples_sptr = boost::shared_ptr<unpack_spir_gss6450_samples>;
+using unpack_spir_gss6450_samples_sptr = std::shared_ptr<unpack_spir_gss6450_samples>;

 unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit_);

--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
@@ -44,16 +44,16 @@ Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item,
 }


-boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue, bool stop_flowgraph)
+std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue, bool stop_flowgraph)
 {
-    boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
+    std::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
    return valve_;
 }


-boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue)
+std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue)
 {
-    boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), true));
+    std::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), true));
    return valve_;
 }

--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
@@ -24,7 +24,7 @@
 #define GNSS_SDR_GNSS_SDR_VALVE_H

 #include "concurrent_queue.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <gnuradio/sync_block.h>  // for sync_block
 #include <gnuradio/types.h>       // for gr_vector_const_void_star
 #include <pmt/pmt.h>
@@ -34,12 +34,12 @@

 class Gnss_Sdr_Valve;

-boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
+std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
    size_t sizeof_stream_item,
    uint64_t nitems,
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue);

-boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
+std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
    size_t sizeof_stream_item,
    uint64_t nitems,
    std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue,
@@ -59,12 +59,12 @@ public:
        gr_vector_void_star &output_items);

 private:
-    friend boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
+    friend std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
        size_t sizeof_stream_item,
        uint64_t nitems,
        std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue);

-    friend boost::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
+    friend std::shared_ptr<Gnss_Sdr_Valve> gnss_sdr_make_valve(
        size_t sizeof_stream_item,
        uint64_t nitems,
        std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue,