forked from sdr/gr-osmosdr
Replace boost::shared_ptr with std::shared_ptr
Signed-off-by: Eric Wild <ewild@sysmocom.de>fixeria/gr3.10
parent
cffef690f2
commit
159885f9e6
|
@ -38,7 +38,7 @@ class sink;
|
|||
class OSMOSDR_API sink : virtual public gr::hier_block2
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr< sink > sptr;
|
||||
typedef std::shared_ptr< sink > sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of sink.
|
||||
|
|
|
@ -38,7 +38,7 @@ class source;
|
|||
class OSMOSDR_API source : virtual public gr::hier_block2
|
||||
{
|
||||
public:
|
||||
typedef boost::shared_ptr< source > sptr;
|
||||
typedef std::shared_ptr< source > sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of source.
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
class airspy_source_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr::blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -44,9 +44,9 @@ class airspy_source_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<airspy_source_c> airspy_source_c_sptr;
|
||||
typedef std::shared_ptr<airspy_source_c> airspy_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of airspy_source_c.
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
class airspyhf_source_c;
|
||||
|
||||
typedef boost::shared_ptr<airspyhf_source_c> airspyhf_source_c_sptr;
|
||||
typedef std::shared_ptr<airspyhf_source_c> airspyhf_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of airspyhf_source_c.
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
class bladerf_sink_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -38,9 +38,9 @@ class bladerf_sink_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<bladerf_sink_c> bladerf_sink_c_sptr;
|
||||
typedef std::shared_ptr<bladerf_sink_c> bladerf_sink_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of bladerf_sink_c.
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
class bladerf_source_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -38,9 +38,9 @@ class bladerf_source_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<bladerf_source_c> bladerf_source_c_sptr;
|
||||
typedef std::shared_ptr<bladerf_source_c> bladerf_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of bladerf_source_c.
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
class fcd_source_c;
|
||||
|
||||
typedef boost::shared_ptr< fcd_source_c > fcd_source_c_sptr;
|
||||
typedef std::shared_ptr< fcd_source_c > fcd_source_c_sptr;
|
||||
|
||||
fcd_source_c_sptr make_fcd_source_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
class file_sink_c;
|
||||
|
||||
typedef boost::shared_ptr< file_sink_c > file_sink_c_sptr;
|
||||
typedef std::shared_ptr< file_sink_c > file_sink_c_sptr;
|
||||
|
||||
file_sink_c_sptr make_file_sink_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
class file_source_c;
|
||||
|
||||
typedef boost::shared_ptr< file_source_c > file_source_c_sptr;
|
||||
typedef std::shared_ptr< file_source_c > file_source_c_sptr;
|
||||
|
||||
file_source_c_sptr make_file_source_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
class freesrp_sink_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -47,9 +47,9 @@ class freesrp_sink_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<freesrp_sink_c> freesrp_sink_c_sptr;
|
||||
typedef std::shared_ptr<freesrp_sink_c> freesrp_sink_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of freesrp_sink_c.
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
class freesrp_source_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -48,9 +48,9 @@ class freesrp_source_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<freesrp_source_c> freesrp_source_c_sptr;
|
||||
typedef std::shared_ptr<freesrp_source_c> freesrp_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of freesrp_source_c.
|
||||
|
|
|
@ -45,7 +45,7 @@ typedef struct circular_buffer
|
|||
} circular_buffer_t;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr::blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -53,9 +53,9 @@ typedef struct circular_buffer
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<hackrf_sink_c> hackrf_sink_c_sptr;
|
||||
typedef std::shared_ptr<hackrf_sink_c> hackrf_sink_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of hackrf_sink_c.
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
class hackrf_source_c;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr::blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -42,9 +42,9 @@ class hackrf_source_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<hackrf_source_c> hackrf_source_c_sptr;
|
||||
typedef std::shared_ptr<hackrf_source_c> hackrf_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of hackrf_source_c.
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
class redpitaya_sink_c;
|
||||
|
||||
typedef boost::shared_ptr< redpitaya_sink_c > redpitaya_sink_c_sptr;
|
||||
typedef std::shared_ptr< redpitaya_sink_c > redpitaya_sink_c_sptr;
|
||||
|
||||
redpitaya_sink_c_sptr make_redpitaya_sink_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
class redpitaya_source_c;
|
||||
|
||||
typedef boost::shared_ptr< redpitaya_source_c > redpitaya_source_c_sptr;
|
||||
typedef std::shared_ptr< redpitaya_source_c > redpitaya_source_c_sptr;
|
||||
|
||||
redpitaya_source_c_sptr make_redpitaya_source_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ class rfspace_source_c;
|
|||
#endif
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -46,9 +46,9 @@ class rfspace_source_c;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<rfspace_source_c> rfspace_source_c_sptr;
|
||||
typedef std::shared_ptr<rfspace_source_c> rfspace_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of rfspace_source_c.
|
||||
|
|
|
@ -35,7 +35,7 @@ class rtl_source_c;
|
|||
typedef struct rtlsdr_dev rtlsdr_dev_t;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr::blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -43,9 +43,9 @@ typedef struct rtlsdr_dev rtlsdr_dev_t;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<rtl_source_c> rtl_source_c_sptr;
|
||||
typedef std::shared_ptr<rtl_source_c> rtl_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of rtl_source_c.
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
class rtl_tcp_source_c;
|
||||
|
||||
typedef boost::shared_ptr< rtl_tcp_source_c > rtl_tcp_source_c_sptr;
|
||||
typedef std::shared_ptr< rtl_tcp_source_c > rtl_tcp_source_c_sptr;
|
||||
|
||||
rtl_tcp_source_c_sptr make_rtl_tcp_source_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -59,7 +59,7 @@ enum rtlsdr_tuner {
|
|||
};
|
||||
|
||||
class rtl_tcp_source_f;
|
||||
typedef boost::shared_ptr<rtl_tcp_source_f> rtl_tcp_source_f_sptr;
|
||||
typedef std::shared_ptr<rtl_tcp_source_f> rtl_tcp_source_f_sptr;
|
||||
|
||||
rtl_tcp_source_f_sptr make_rtl_tcp_source_f (
|
||||
size_t itemsize,
|
||||
|
|
|
@ -36,7 +36,7 @@ class sdrplay_source_c;
|
|||
typedef struct sdrplay_dev sdrplay_dev_t;
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr::blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -44,9 +44,9 @@ typedef struct sdrplay_dev sdrplay_dev_t;
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<sdrplay_source_c> sdrplay_source_c_sptr;
|
||||
typedef std::shared_ptr<sdrplay_source_c> sdrplay_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of sdrplay_source_c.
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace SoapySDR
|
|||
}
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -44,9 +44,9 @@ namespace SoapySDR
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<soapy_sink_c> soapy_sink_c_sptr;
|
||||
typedef std::shared_ptr<soapy_sink_c> soapy_sink_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of soapy_sink_c.
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace SoapySDR
|
|||
}
|
||||
|
||||
/*
|
||||
* We use boost::shared_ptr's instead of raw pointers for all access
|
||||
* We use std::shared_ptr's instead of raw pointers for all access
|
||||
* to gr_blocks (and many other data structures). The shared_ptr gets
|
||||
* us transparent reference counting, which greatly simplifies storage
|
||||
* management issues. This is especially helpful in our hybrid
|
||||
|
@ -44,9 +44,9 @@ namespace SoapySDR
|
|||
*
|
||||
* See http://www.boost.org/libs/smart_ptr/smart_ptr.htm
|
||||
*
|
||||
* As a convention, the _sptr suffix indicates a boost::shared_ptr
|
||||
* As a convention, the _sptr suffix indicates a std::shared_ptr
|
||||
*/
|
||||
typedef boost::shared_ptr<soapy_source_c> soapy_source_c_sptr;
|
||||
typedef std::shared_ptr<soapy_source_c> soapy_source_c_sptr;
|
||||
|
||||
/*!
|
||||
* \brief Return a shared_ptr to a new instance of soapy_source_c.
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
class uhd_sink_c;
|
||||
|
||||
typedef boost::shared_ptr< uhd_sink_c > uhd_sink_c_sptr;
|
||||
typedef std::shared_ptr< uhd_sink_c > uhd_sink_c_sptr;
|
||||
|
||||
uhd_sink_c_sptr make_uhd_sink_c(const std::string &args = "");
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
class uhd_source_c;
|
||||
|
||||
typedef boost::shared_ptr< uhd_source_c > uhd_source_c_sptr;
|
||||
typedef std::shared_ptr< uhd_source_c > uhd_source_c_sptr;
|
||||
|
||||
uhd_source_c_sptr make_uhd_source_c(const std::string &args = "");
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
class xtrx_obj;
|
||||
|
||||
typedef boost::shared_ptr<xtrx_obj> xtrx_obj_sptr;
|
||||
typedef std::shared_ptr<xtrx_obj> xtrx_obj_sptr;
|
||||
|
||||
class xtrx_obj
|
||||
{
|
||||
|
|
|
@ -36,7 +36,7 @@ static const pmt::pmt_t COMMAND_KEY = pmt::string_to_symbol("tx_command");
|
|||
|
||||
class xtrx_sink_c;
|
||||
|
||||
typedef boost::shared_ptr< xtrx_sink_c > xtrx_sink_c_sptr;
|
||||
typedef std::shared_ptr< xtrx_sink_c > xtrx_sink_c_sptr;
|
||||
|
||||
xtrx_sink_c_sptr make_xtrx_sink_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ static const pmt::pmt_t FREQ_KEY = pmt::string_to_symbol("rx_freq");
|
|||
|
||||
class xtrx_source_c;
|
||||
|
||||
typedef boost::shared_ptr< xtrx_source_c > xtrx_source_c_sptr;
|
||||
typedef std::shared_ptr< xtrx_source_c > xtrx_source_c_sptr;
|
||||
|
||||
xtrx_source_c_sptr make_xtrx_source_c( const std::string & args = "" );
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
};
|
||||
|
||||
%define OSMOSDR_SWIG_BLOCK_MAGIC2(PKG, BASE_NAME)
|
||||
%template(BASE_NAME ## _sptr) boost::shared_ptr<PKG ## :: ## BASE_NAME>;
|
||||
%template(BASE_NAME ## _sptr) std::shared_ptr<PKG ## :: ## BASE_NAME>;
|
||||
%pythoncode %{
|
||||
BASE_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id())
|
||||
BASE_NAME = BASE_NAME.make;
|
||||
|
|
Loading…
Reference in New Issue