diff options
Diffstat (limited to 'gnuradio-runtime/swig')
-rw-r--r-- | gnuradio-runtime/swig/basic_block.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/block.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/block_detail.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/block_gateway.i | 2 | ||||
-rw-r--r-- | gnuradio-runtime/swig/buffer.i | 8 | ||||
-rw-r--r-- | gnuradio-runtime/swig/gr_shared_ptr.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/gr_swig_block_magic.i | 10 | ||||
-rw-r--r-- | gnuradio-runtime/swig/gr_types.i | 2 | ||||
-rw-r--r-- | gnuradio-runtime/swig/hier_block2.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/io_signature.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/message.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/msg_queue.i | 4 | ||||
-rw-r--r-- | gnuradio-runtime/swig/pmt_swig.i | 10 | ||||
-rw-r--r-- | gnuradio-runtime/swig/top_block.i | 2 |
14 files changed, 33 insertions, 33 deletions
diff --git a/gnuradio-runtime/swig/basic_block.i b/gnuradio-runtime/swig/basic_block.i index 7864ef3e95..3ded09031a 100644 --- a/gnuradio-runtime/swig/basic_block.i +++ b/gnuradio-runtime/swig/basic_block.i @@ -9,8 +9,8 @@ */ class gr::basic_block; -typedef boost::shared_ptr<gr::basic_block> gr::basic_block_sptr; -%template(basic_block_sptr) boost::shared_ptr<gr::basic_block>; +typedef std::shared_ptr<gr::basic_block> gr::basic_block_sptr; +%template(basic_block_sptr) std::shared_ptr<gr::basic_block>; %import "pmt_swig.i" diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i index d931f505e9..fb21dd1447 100644 --- a/gnuradio-runtime/swig/block.i +++ b/gnuradio-runtime/swig/block.i @@ -11,8 +11,8 @@ %include <basic_block.i> class gr::block; -typedef boost::shared_ptr<gr::block> gr::block_sptr; -%template(block_sptr) boost::shared_ptr<gr::block>; +typedef std::shared_ptr<gr::block> gr::block_sptr; +%template(block_sptr) std::shared_ptr<gr::block>; // support vectors of these... namespace std { diff --git a/gnuradio-runtime/swig/block_detail.i b/gnuradio-runtime/swig/block_detail.i index a2af931909..6e335aaf36 100644 --- a/gnuradio-runtime/swig/block_detail.i +++ b/gnuradio-runtime/swig/block_detail.i @@ -9,8 +9,8 @@ */ class gr::block_detail; -typedef boost::shared_ptr<gr::block_detail> gr::block_detail_sptr; -%template(block_detail_sptr) boost::shared_ptr<gr::block_detail>; +typedef std::shared_ptr<gr::block_detail> gr::block_detail_sptr; +%template(block_detail_sptr) std::shared_ptr<gr::block_detail>; %rename(block_detail) gr::make_block_detail; %ignore gr::block_detail; diff --git a/gnuradio-runtime/swig/block_gateway.i b/gnuradio-runtime/swig/block_gateway.i index a2fb4e5e99..b95b045b72 100644 --- a/gnuradio-runtime/swig/block_gateway.i +++ b/gnuradio-runtime/swig/block_gateway.i @@ -29,7 +29,7 @@ //////////////////////////////////////////////////////////////////////// %include <gnuradio/block_gateway.h> -%template(block_gateway_sptr) boost::shared_ptr<gr::block_gateway>; +%template(block_gateway_sptr) std::shared_ptr<gr::block_gateway>; %pythoncode %{ block_gateway_sptr.__repr__ = lambda self: "<block_gateway>" block_gateway = block_gateway.make; diff --git a/gnuradio-runtime/swig/buffer.i b/gnuradio-runtime/swig/buffer.i index 09219881d9..a95c7996a0 100644 --- a/gnuradio-runtime/swig/buffer.i +++ b/gnuradio-runtime/swig/buffer.i @@ -9,8 +9,8 @@ */ class gr::buffer; -typedef boost::shared_ptr<gr::buffer> gr::buffer_sptr; -%template(buffer_sptr) boost::shared_ptr<gr::buffer>; +typedef std::shared_ptr<gr::buffer> gr::buffer_sptr; +%template(buffer_sptr) std::shared_ptr<gr::buffer>; %rename(buffer) gr::make_buffer; %ignore gr::buffer; @@ -18,8 +18,8 @@ gr::buffer_sptr gr::make_buffer (int nitems, size_t sizeof_item, gr::block_sptr link); class gr::buffer_reader; -typedef boost::shared_ptr<gr::buffer_reader> gr::buffer_reader_sptr; -%template(buffer_reader_sptr) boost::shared_ptr<gr::buffer_reader>; +typedef std::shared_ptr<gr::buffer_reader> gr::buffer_reader_sptr; +%template(buffer_reader_sptr) std::shared_ptr<gr::buffer_reader>; %ignore gr::buffer_reader; %rename(buffer_add_reader) gr::buffer_add_reader; diff --git a/gnuradio-runtime/swig/gr_shared_ptr.i b/gnuradio-runtime/swig/gr_shared_ptr.i index 323d33ad73..3e601038f5 100644 --- a/gnuradio-runtime/swig/gr_shared_ptr.i +++ b/gnuradio-runtime/swig/gr_shared_ptr.i @@ -7,12 +7,12 @@ // // -// This is highly hacked up version of boost::shared_ptr +// This is highly hacked up version of std::shared_ptr // We just need enough to get SWIG to "do the right thing" and // generate "Smart Pointer" code. // -namespace boost { +namespace std { template<class T> class shared_ptr { diff --git a/gnuradio-runtime/swig/gr_swig_block_magic.i b/gnuradio-runtime/swig/gr_swig_block_magic.i index 06c9180654..82f79b5e76 100644 --- a/gnuradio-runtime/swig/gr_swig_block_magic.i +++ b/gnuradio-runtime/swig/gr_swig_block_magic.i @@ -14,8 +14,8 @@ _GR_SWIG_BLOCK_MAGIC_HELPER(PKG, BASE_NAME, PKG ## _ ## BASE_NAME) %define _GR_SWIG_BLOCK_MAGIC_HELPER_COMMON(PKG, BASE_NAME, FULL_NAME) class FULL_NAME; -typedef boost::shared_ptr<FULL_NAME> FULL_NAME ## _sptr; -%template(FULL_NAME ## _sptr) boost::shared_ptr<FULL_NAME>; +typedef std::shared_ptr<FULL_NAME> FULL_NAME ## _sptr; +%template(FULL_NAME ## _sptr) std::shared_ptr<FULL_NAME>; %rename(BASE_NAME) PKG ## _make_ ## BASE_NAME; %ignore FULL_NAME; %enddef @@ -30,7 +30,7 @@ FULL_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), #endif %define GR_SWIG_BLOCK_MAGIC2(PKG, BASE_NAME) -%template(BASE_NAME ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>; +%template(BASE_NAME ## _sptr) std::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>; %pythoncode %{ BASE_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id()) BASE_NAME = BASE_NAME.make; @@ -39,7 +39,7 @@ BASE_NAME = BASE_NAME.make; %define GR_SWIG_BLOCK_MAGIC2_TMPL(PKG, BASE_NAME, TARGET_NAME...) %template(BASE_NAME) gr:: ## PKG ## :: ## TARGET_NAME; -%template(BASE_NAME ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## TARGET_NAME ## >; +%template(BASE_NAME ## _sptr) std::shared_ptr<gr:: ## PKG ## :: ## TARGET_NAME ## >; %pythoncode %{ BASE_NAME ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id()) BASE_NAME = BASE_NAME.make @@ -48,7 +48,7 @@ BASE_NAME = BASE_NAME.make %define GR_SWIG_BLOCK_MAGIC_FACTORY(PKG, BASE_NAME, FACTORY) -%template(FACTORY ## _sptr) boost::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>; +%template(FACTORY ## _sptr) std::shared_ptr<gr:: ## PKG ## :: ## BASE_NAME>; %pythoncode %{ FACTORY ## _sptr.__repr__ = lambda self: "<gr_block %s (%d)>" % (self.name(), self.unique_id()) FACTORY = BASE_NAME ## _make_ ## FACTORY; diff --git a/gnuradio-runtime/swig/gr_types.i b/gnuradio-runtime/swig/gr_types.i index b703a3168d..8fbc597e76 100644 --- a/gnuradio-runtime/swig/gr_types.i +++ b/gnuradio-runtime/swig/gr_types.i @@ -14,7 +14,7 @@ %include "stdint.i" %{ -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/any.hpp> #include <complex> #include <string> diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i index 51356c233b..0b21870c5c 100644 --- a/gnuradio-runtime/swig/hier_block2.i +++ b/gnuradio-runtime/swig/hier_block2.i @@ -11,8 +11,8 @@ %include <basic_block.i> class gr::hier_block2; -typedef boost::shared_ptr<gr::hier_block2> gr::hier_block2_sptr; -%template(hier_block2_sptr) boost::shared_ptr<gr::hier_block2>; +typedef std::shared_ptr<gr::hier_block2> gr::hier_block2_sptr; +%template(hier_block2_sptr) std::shared_ptr<gr::hier_block2>; namespace gr { // Hack to have a Python shim implementation of gr.hier_block2 diff --git a/gnuradio-runtime/swig/io_signature.i b/gnuradio-runtime/swig/io_signature.i index 9514fabd57..7fc029fc07 100644 --- a/gnuradio-runtime/swig/io_signature.i +++ b/gnuradio-runtime/swig/io_signature.i @@ -16,7 +16,7 @@ namespace gr { const std::vector<int> &sizeof_stream_items); public: - typedef boost::shared_ptr<io_signature> sptr; + typedef std::shared_ptr<io_signature> sptr; // Avoids a swig warning, otherwise we could just // #include <gnuradio/io_signature.h> instead of redoing this @@ -47,7 +47,7 @@ namespace gr { } /* namespace gr */ -%template(io_signature_sptr) boost::shared_ptr<gr::io_signature>; +%template(io_signature_sptr) std::shared_ptr<gr::io_signature>; %pythoncode %{ io_signature_sptr.__repr__ = lambda self: "<io_signature: %d, %d>" % (self.min_streams(), self.max_streams()) io_signaturev = io_signature.makev; diff --git a/gnuradio-runtime/swig/message.i b/gnuradio-runtime/swig/message.i index 36fa9e9274..4265d3a9ab 100644 --- a/gnuradio-runtime/swig/message.i +++ b/gnuradio-runtime/swig/message.i @@ -25,7 +25,7 @@ namespace gr { class message { public: - typedef boost::shared_ptr<message> sptr; + typedef std::shared_ptr<message> sptr; private: message(long type, double arg1, double arg2, size_t length); @@ -59,7 +59,7 @@ namespace gr { -%template(message_sptr) boost::shared_ptr<gr::message>; +%template(message_sptr) std::shared_ptr<gr::message>; %pythoncode %{ message_from_string = message.make_from_string message = message.make diff --git a/gnuradio-runtime/swig/msg_queue.i b/gnuradio-runtime/swig/msg_queue.i index 166c3c7541..20ca9d16ef 100644 --- a/gnuradio-runtime/swig/msg_queue.i +++ b/gnuradio-runtime/swig/msg_queue.i @@ -15,7 +15,7 @@ namespace gr { class msg_queue : public gr::msg_handler { public: - typedef boost::shared_ptr<msg_queue> sptr; + typedef std::shared_ptr<msg_queue> sptr; static sptr make(unsigned int limit=0); @@ -86,7 +86,7 @@ namespace gr { %} // smash in new python delete_head and insert_tail methods... -%template(msg_queue_sptr) boost::shared_ptr<gr::msg_queue>; +%template(msg_queue_sptr) std::shared_ptr<gr::msg_queue>; %pythoncode %{ msg_queue_sptr.delete_head = py_msg_queue__delete_head msg_queue_sptr.insert_tail = py_msg_queue__insert_tail diff --git a/gnuradio-runtime/swig/pmt_swig.i b/gnuradio-runtime/swig/pmt_swig.i index 16a9b8fd9d..c4af239351 100644 --- a/gnuradio-runtime/swig/pmt_swig.i +++ b/gnuradio-runtime/swig/pmt_swig.i @@ -14,7 +14,7 @@ %include "stdint.i" %{ -#include <boost/shared_ptr.hpp> +#include <memory> #include <boost/any.hpp> #include <complex> #include <string> @@ -67,11 +67,11 @@ namespace pmt { // Language independent exception handler //////////////////////////////////////////////////////////////////////// -%template(swig_pmt_ptr) boost::shared_ptr<pmt::pmt_base>; +%template(swig_pmt_ptr) std::shared_ptr<pmt::pmt_base>; namespace pmt{ class pmt_base; - typedef boost::shared_ptr<pmt::pmt_base> pmt_t; + typedef std::shared_ptr<pmt::pmt_base> pmt_t; %pythoncode %{ @@ -253,8 +253,8 @@ namespace pmt{ void any_set(pmt_t obj, const boost::any &any); bool is_msg_accepter(const pmt_t &obj); - pmt_t make_msg_accepter(boost::shared_ptr<gr::messages::msg_accepter> ma); - boost::shared_ptr<gr::messages::msg_accepter> msg_accepter_ref(const pmt_t &obj); + pmt_t make_msg_accepter(std::shared_ptr<gr::messages::msg_accepter> ma); + std::shared_ptr<gr::messages::msg_accepter> msg_accepter_ref(const pmt_t &obj); bool eq(const pmt_t& x, const pmt_t& y); bool eqv(const pmt_t& x, const pmt_t& y); diff --git a/gnuradio-runtime/swig/top_block.i b/gnuradio-runtime/swig/top_block.i index aec6218c1d..71a0fd2c45 100644 --- a/gnuradio-runtime/swig/top_block.i +++ b/gnuradio-runtime/swig/top_block.i @@ -8,7 +8,7 @@ * */ -%template(top_block_sptr) boost::shared_ptr<gr::top_block>; +%template(top_block_sptr) std::shared_ptr<gr::top_block>; namespace gr { // Hack to have a Python shim implementation of gr.top_block |