diff options
512 files changed, 659 insertions, 665 deletions
diff --git a/docs/doxygen/other/shared_ptr_docstub.h b/docs/doxygen/other/shared_ptr_docstub.h index a9893ab04d..0b9cfc53d3 100644 --- a/docs/doxygen/other/shared_ptr_docstub.h +++ b/docs/doxygen/other/shared_ptr_docstub.h @@ -1,4 +1,4 @@ -namespace boost { +namespace std { /*! * \brief shared_ptr documentation stub * @@ -20,4 +20,4 @@ public: }; // shared_ptr -} // namespace boost +} // namespace std diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h index 90c9c2f8bc..8a906283c3 100644 --- a/gnuradio-runtime/include/gnuradio/basic_block.h +++ b/gnuradio-runtime/include/gnuradio/basic_block.h @@ -17,7 +17,6 @@ #include <gnuradio/runtime_types.h> #include <gnuradio/sptr_magic.h> #include <gnuradio/thread/thread.h> -#include <boost/enable_shared_from_this.hpp> #include <boost/function.hpp> #include <boost/thread/condition_variable.hpp> #include <deque> @@ -41,7 +40,7 @@ namespace gr { * processing functions. */ class GR_RUNTIME_API basic_block : public msg_accepter, - public boost::enable_shared_from_this<basic_block> + public std::enable_shared_from_this<basic_block> { typedef boost::function<void(pmt::pmt_t)> msg_handler_t; @@ -53,7 +52,7 @@ private: typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comparator> msg_queue_map_t; typedef std::map<pmt::pmt_t, msg_queue_t, pmt::comparator>::iterator msg_queue_map_itr; - std::map<pmt::pmt_t, boost::shared_ptr<boost::condition_variable>, pmt::comparator> + std::map<pmt::pmt_t, std::shared_ptr<boost::condition_variable>, pmt::comparator> msg_queue_ready; gr::thread::mutex mutex; //< protects all vars @@ -291,7 +290,7 @@ public: * store them. Each block has a vector to do this, and these never * need to be accessed again once they are registered with the RPC * backend. This function takes a - * boost::shared_sptr<rpcbasic_base> so that when the block is + * std::shared_sptr<rpcbasic_base> so that when the block is * deleted, all RPC registered variables are cleaned up. * * \param s an rpcbasic_sptr of the new RPC variable register to store. diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h index 2f39cad5ce..51c232c44a 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h @@ -955,7 +955,7 @@ typedef std::vector<block_sptr>::iterator block_viter_t; inline block_sptr cast_to_block_sptr(basic_block_sptr p) { - return boost::dynamic_pointer_cast<block, basic_block>(p); + return std::dynamic_pointer_cast<block, basic_block>(p); } GR_RUNTIME_API std::ostream& operator<<(std::ostream& os, const block* m); diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index 81bbf277dc..a4867f73a9 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -86,7 +86,7 @@ class GR_RUNTIME_API block_gateway : virtual public gr::block { public: // gr::block_gateway::sptr - typedef boost::shared_ptr<block_gateway> sptr; + typedef std::shared_ptr<block_gateway> sptr; /*! * Make a new gateway block. diff --git a/gnuradio-runtime/include/gnuradio/buffer.h b/gnuradio-runtime/include/gnuradio/buffer.h index a0ddbc1def..3b3404a415 100644 --- a/gnuradio-runtime/include/gnuradio/buffer.h +++ b/gnuradio-runtime/include/gnuradio/buffer.h @@ -158,7 +158,7 @@ private: gr::vmcircbuf* d_vmcircbuf; size_t d_sizeof_item; // in bytes std::vector<buffer_reader*> d_readers; - boost::weak_ptr<block> d_link; // block that writes to this buffer + std::weak_ptr<block> d_link; // block that writes to this buffer // // The mutex protects d_write_index, d_abs_write_offset, d_done, d_item_tags @@ -333,10 +333,10 @@ private: int delay); buffer_sptr d_buffer; - unsigned int d_read_index; // in items [0,d->buffer.d_bufsize) - uint64_t d_abs_read_offset; // num items seen since the start - boost::weak_ptr<block> d_link; // block that reads via this buffer reader - unsigned d_attr_delay; // sample delay attribute for tag propagation + unsigned int d_read_index; // in items [0,d->buffer.d_bufsize) + uint64_t d_abs_read_offset; // num items seen since the start + std::weak_ptr<block> d_link; // block that reads via this buffer reader + unsigned d_attr_delay; // sample delay attribute for tag propagation //! constructor is private. Use gr::buffer::add_reader to create instances buffer_reader(buffer_sptr buffer, unsigned int read_index, block_sptr link); diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h index aebbb3ac3b..d49fadb7e8 100644 --- a/gnuradio-runtime/include/gnuradio/hier_block2.h +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h @@ -319,7 +319,7 @@ GR_RUNTIME_API std::string dot_graph(hier_block2_sptr hierblock2); inline hier_block2_sptr cast_to_hier_block2_sptr(basic_block_sptr block) { - return boost::dynamic_pointer_cast<hier_block2, basic_block>(block); + return std::dynamic_pointer_cast<hier_block2, basic_block>(block); } } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/io_signature.h b/gnuradio-runtime/include/gnuradio/io_signature.h index f4a9106891..8d38e0d44c 100644 --- a/gnuradio-runtime/include/gnuradio/io_signature.h +++ b/gnuradio-runtime/include/gnuradio/io_signature.h @@ -31,7 +31,7 @@ class GR_RUNTIME_API io_signature const std::vector<int>& sizeof_stream_items); public: - typedef boost::shared_ptr<io_signature> sptr; + typedef std::shared_ptr<io_signature> sptr; static constexpr int IO_INFINITE = -1; diff --git a/gnuradio-runtime/include/gnuradio/message.h b/gnuradio-runtime/include/gnuradio/message.h index 2567e46c63..9a89d64bd3 100644 --- a/gnuradio-runtime/include/gnuradio/message.h +++ b/gnuradio-runtime/include/gnuradio/message.h @@ -27,7 +27,7 @@ namespace gr { class GR_RUNTIME_API message { public: - typedef boost::shared_ptr<message> sptr; + typedef std::shared_ptr<message> sptr; private: sptr d_next; // link field for msg queue diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h b/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h index 80d837be4b..faeeb70a2d 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_accepter.h @@ -13,7 +13,7 @@ #include <gnuradio/api.h> #include <pmt/pmt.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace messages { @@ -37,7 +37,7 @@ public: virtual void post(pmt::pmt_t which_port, pmt::pmt_t msg) = 0; }; -typedef boost::shared_ptr<msg_accepter> msg_accepter_sptr; +typedef std::shared_ptr<msg_accepter> msg_accepter_sptr; } /* namespace messages */ } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h index 88c80f08d9..6152bf4473 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_producer.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_producer.h @@ -13,7 +13,7 @@ #include <gnuradio/api.h> #include <pmt/pmt.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace messages { @@ -33,7 +33,7 @@ public: virtual pmt::pmt_t retrieve() = 0; }; -typedef boost::shared_ptr<msg_producer> msg_producer_sptr; +typedef std::shared_ptr<msg_producer> msg_producer_sptr; } /* namespace messages */ } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/messages/msg_queue.h b/gnuradio-runtime/include/gnuradio/messages/msg_queue.h index 0fab90a672..aaf753cb72 100644 --- a/gnuradio-runtime/include/gnuradio/messages/msg_queue.h +++ b/gnuradio-runtime/include/gnuradio/messages/msg_queue.h @@ -20,7 +20,7 @@ namespace gr { namespace messages { class msg_queue; -typedef boost::shared_ptr<msg_queue> msg_queue_sptr; +typedef std::shared_ptr<msg_queue> msg_queue_sptr; msg_queue_sptr make_msg_queue(unsigned int limit = 0); diff --git a/gnuradio-runtime/include/gnuradio/msg_handler.h b/gnuradio-runtime/include/gnuradio/msg_handler.h index f97488e5d8..f64f51509e 100644 --- a/gnuradio-runtime/include/gnuradio/msg_handler.h +++ b/gnuradio-runtime/include/gnuradio/msg_handler.h @@ -17,7 +17,7 @@ namespace gr { class msg_handler; -typedef boost::shared_ptr<msg_handler> msg_handler_sptr; +typedef std::shared_ptr<msg_handler> msg_handler_sptr; /*! * \brief abstract class of message handlers diff --git a/gnuradio-runtime/include/gnuradio/msg_queue.h b/gnuradio-runtime/include/gnuradio/msg_queue.h index 7a0c8c4205..af1286345e 100644 --- a/gnuradio-runtime/include/gnuradio/msg_queue.h +++ b/gnuradio-runtime/include/gnuradio/msg_queue.h @@ -32,7 +32,7 @@ class GR_RUNTIME_API msg_queue : public msg_handler unsigned int d_limit; // max # of messages in queue. 0 -> unbounded public: - typedef boost::shared_ptr<msg_queue> sptr; + typedef std::shared_ptr<msg_queue> sptr; static sptr make(unsigned int limit = 0); diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h index 9c2d0bb3fa..a23fe40596 100644 --- a/gnuradio-runtime/include/gnuradio/rpcmanager_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcmanager_base.h @@ -11,7 +11,7 @@ #ifndef RPCMANAGER_BASE_H #define RPCMANAGER_BASE_H -#include <boost/shared_ptr.hpp> +#include <memory> class rpcserver_booter_base; // class rpcserver_booter_aggregator; @@ -19,7 +19,7 @@ class rpcserver_booter_base; class rpcmanager_base { public: - typedef boost::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr; + typedef std::shared_ptr<rpcserver_booter_base> rpcserver_booter_base_sptr; rpcmanager_base() { ; } ~rpcmanager_base() { ; } diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h index d48898b572..bb911e462c 100644 --- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h +++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h @@ -21,7 +21,7 @@ // Fixes circular dependency issue before including block_registry.h class rpcbasic_base; -typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr; +typedef std::shared_ptr<rpcbasic_base> rpcbasic_sptr; #include <gnuradio/block_registry.h> diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_base.h b/gnuradio-runtime/include/gnuradio/rpcserver_base.h index 6a2f9492d6..57b4e9876b 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_base.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_base.h @@ -33,7 +33,7 @@ public: virtual void setCurPrivLevel(const priv_lvl_t priv) { cur_priv = priv; } - typedef boost::shared_ptr<rpcserver_base> rpcserver_base_sptr; + typedef std::shared_ptr<rpcserver_base> rpcserver_base_sptr; protected: priv_lvl_t cur_priv; diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h index f7ae2c7c1b..06831ffc27 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_booter_aggregator.h @@ -14,7 +14,7 @@ #include <gnuradio/api.h> #include <gnuradio/rpcserver_aggregator.h> #include <gnuradio/rpcserver_booter_base.h> -#include <boost/shared_ptr.hpp> +#include <memory> #include <string> class rpcserver_server; @@ -37,7 +37,7 @@ protected: private: std::string d_type; - boost::shared_ptr<rpcserver_aggregator> server; + std::shared_ptr<rpcserver_aggregator> server; }; #endif /* RPCSERVER_BOOTER_AGGREGATOR */ diff --git a/gnuradio-runtime/include/gnuradio/runtime_types.h b/gnuradio-runtime/include/gnuradio/runtime_types.h index 774cca41b3..f78d91a778 100644 --- a/gnuradio-runtime/include/gnuradio/runtime_types.h +++ b/gnuradio-runtime/include/gnuradio/runtime_types.h @@ -29,15 +29,15 @@ class flat_flowgraph; class flowgraph; class top_block; -typedef boost::shared_ptr<basic_block> basic_block_sptr; -typedef boost::shared_ptr<block> block_sptr; -typedef boost::shared_ptr<block_detail> block_detail_sptr; -typedef boost::shared_ptr<buffer> buffer_sptr; -typedef boost::shared_ptr<buffer_reader> buffer_reader_sptr; -typedef boost::shared_ptr<hier_block2> hier_block2_sptr; -typedef boost::shared_ptr<flat_flowgraph> flat_flowgraph_sptr; -typedef boost::shared_ptr<flowgraph> flowgraph_sptr; -typedef boost::shared_ptr<top_block> top_block_sptr; +typedef std::shared_ptr<basic_block> basic_block_sptr; +typedef std::shared_ptr<block> block_sptr; +typedef std::shared_ptr<block_detail> block_detail_sptr; +typedef std::shared_ptr<buffer> buffer_sptr; +typedef std::shared_ptr<buffer_reader> buffer_reader_sptr; +typedef std::shared_ptr<hier_block2> hier_block2_sptr; +typedef std::shared_ptr<flat_flowgraph> flat_flowgraph_sptr; +typedef std::shared_ptr<flowgraph> flowgraph_sptr; +typedef std::shared_ptr<top_block> top_block_sptr; } /* namespace gr */ diff --git a/gnuradio-runtime/include/gnuradio/sptr_magic.h b/gnuradio-runtime/include/gnuradio/sptr_magic.h index 4d447885ab..fdcb68f91d 100644 --- a/gnuradio-runtime/include/gnuradio/sptr_magic.h +++ b/gnuradio-runtime/include/gnuradio/sptr_magic.h @@ -12,7 +12,7 @@ #define INCLUDED_GR_RUNTIME_SPTR_MAGIC_H #include <gnuradio/api.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { class basic_block; @@ -25,7 +25,7 @@ namespace detail { class GR_RUNTIME_API sptr_magic { public: - static boost::shared_ptr<gr::basic_block> fetch_initial_sptr(gr::basic_block* p); + static std::shared_ptr<gr::basic_block> fetch_initial_sptr(gr::basic_block* p); static void create_and_stash_initial_sptr(gr::hier_block2* p); static void cancel_initial_sptr(gr::hier_block2* p); }; @@ -33,12 +33,12 @@ public: /* * \brief New! Improved! Standard method to get/create the - * boost::shared_ptr for a block. + * std::shared_ptr for a block. */ template <class T> -boost::shared_ptr<T> get_initial_sptr(T* p) +std::shared_ptr<T> get_initial_sptr(T* p) { - return boost::dynamic_pointer_cast<T, gr::basic_block>( + return std::dynamic_pointer_cast<T, gr::basic_block>( detail::sptr_magic::fetch_initial_sptr(p)); } } // namespace gnuradio diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h index 56b0c880e7..3683c9a124 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h @@ -12,12 +12,12 @@ #define INCLUDED_THREAD_H #include <gnuradio/api.h> -#include <boost/shared_ptr.hpp> #include <boost/thread/barrier.hpp> #include <boost/thread/condition_variable.hpp> #include <boost/thread/locks.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/thread.hpp> +#include <memory> #include <vector> #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) @@ -38,7 +38,7 @@ typedef boost::mutex mutex; typedef boost::unique_lock<boost::mutex> scoped_lock; typedef boost::condition_variable condition_variable; typedef boost::barrier barrier; -typedef boost::shared_ptr<barrier> barrier_sptr; +typedef std::shared_ptr<barrier> barrier_sptr; /*! \brief a system-dependent typedef for the underlying thread type. */ diff --git a/gnuradio-runtime/include/gnuradio/thrift_application_base.h b/gnuradio-runtime/include/gnuradio/thrift_application_base.h index 4d25029e56..642bba68b5 100644 --- a/gnuradio-runtime/include/gnuradio/thrift_application_base.h +++ b/gnuradio-runtime/include/gnuradio/thrift_application_base.h @@ -51,7 +51,7 @@ public: // Stores the generated endpoint string after the Thrift runtime has initialized. std::string d_endpointStr; // Thread to execute the Thrift runtime's blocking serve() function. - boost::shared_ptr<gr::thread::thread> d_start_thrift_thread; + std::shared_ptr<gr::thread::thread> d_start_thrift_thread; }; /*! @@ -114,7 +114,7 @@ protected: /*! * Reference to the Thrift runtime. */ - boost::scoped_ptr<apache::thrift::server::TServer> d_thriftserver; + std::unique_ptr<apache::thrift::server::TServer> d_thriftserver; /*! * Max number of attempts when checking the Thrift runtime for diff --git a/gnuradio-runtime/include/gnuradio/thrift_server_template.h b/gnuradio-runtime/include/gnuradio/thrift_server_template.h index a88f7fee48..df953ef10e 100644 --- a/gnuradio-runtime/include/gnuradio/thrift_server_template.h +++ b/gnuradio-runtime/include/gnuradio/thrift_server_template.h @@ -38,11 +38,11 @@ protected: friend class thrift_application_base<TserverBase, TImplClass>; private: - boost::shared_ptr<TserverClass> d_handler; - boost::shared_ptr<thrift::TProcessor> d_processor; - boost::shared_ptr<thrift::transport::TServerTransport> d_serverTransport; - boost::shared_ptr<thrift::transport::TTransportFactory> d_transportFactory; - boost::shared_ptr<thrift::protocol::TProtocolFactory> d_protocolFactory; + std::shared_ptr<TserverClass> d_handler; + std::shared_ptr<thrift::TProcessor> d_processor; + std::shared_ptr<thrift::transport::TServerTransport> d_serverTransport; + std::shared_ptr<thrift::transport::TTransportFactory> d_transportFactory; + std::shared_ptr<thrift::protocol::TProtocolFactory> d_protocolFactory; /** * Custom TransportFactory that allows you to override the default Thrift buffer size * of 512 bytes. @@ -59,10 +59,10 @@ private: virtual ~TBufferedTransportFactory() {} - virtual boost::shared_ptr<thrift::transport::TTransport> - getTransport(boost::shared_ptr<thrift::transport::TTransport> trans) + virtual std::shared_ptr<thrift::transport::TTransport> + getTransport(std::shared_ptr<thrift::transport::TTransport> trans) { - return boost::shared_ptr<thrift::transport::TTransport>( + return std::shared_ptr<thrift::transport::TTransport>( new thrift::transport::TBufferedTransport(trans, bufferSize)); } @@ -121,11 +121,11 @@ thrift_server_template<TserverBase, TserverClass, TImplClass>::thrift_server_tem d_processor, d_serverTransport, d_transportFactory, d_protocolFactory)); } else { // std::cout << "Thrift Multi-threaded server : " << d_nthreads << std::endl; - boost::shared_ptr<thrift::concurrency::ThreadManager> threadManager( + std::shared_ptr<thrift::concurrency::ThreadManager> threadManager( thrift::concurrency::ThreadManager::newSimpleThreadManager(nthreads)); threadManager->threadFactory( - boost::shared_ptr<thrift::concurrency::PlatformThreadFactory>( + std::shared_ptr<thrift::concurrency::PlatformThreadFactory>( new thrift::concurrency::PlatformThreadFactory())); threadManager->start(); diff --git a/gnuradio-runtime/include/gnuradio/top_block.h b/gnuradio-runtime/include/gnuradio/top_block.h index fb9ba0b5f4..5454aec035 100644 --- a/gnuradio-runtime/include/gnuradio/top_block.h +++ b/gnuradio-runtime/include/gnuradio/top_block.h @@ -134,7 +134,7 @@ public: inline top_block_sptr cast_to_top_block_sptr(basic_block_sptr block) { - return boost::dynamic_pointer_cast<top_block, basic_block>(block); + return std::dynamic_pointer_cast<top_block, basic_block>(block); } } // namespace gr diff --git a/gnuradio-runtime/include/gnuradio/types.h b/gnuradio-runtime/include/gnuradio/types.h index d6209d5a0a..b9ecbffd1c 100644 --- a/gnuradio-runtime/include/gnuradio/types.h +++ b/gnuradio-runtime/include/gnuradio/types.h @@ -13,7 +13,7 @@ #include <gnuradio/api.h> #include <stddef.h> // size_t -#include <boost/shared_ptr.hpp> +#include <memory> #include <vector> #include <gnuradio/gr_complex.h> diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h index a96d5f22f7..886762ffa2 100644 --- a/gnuradio-runtime/include/pmt/pmt.h +++ b/gnuradio-runtime/include/pmt/pmt.h @@ -15,9 +15,9 @@ #include <stdint.h> #include <boost/any.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> #include <complex> #include <iosfwd> +#include <memory> #include <stdexcept> #include <string> #include <vector> @@ -81,7 +81,7 @@ public: * \brief typedef for shared pointer (transparent reference counting). * See http://www.boost.org/libs/smart_ptr/smart_ptr.htm */ -typedef boost::shared_ptr<pmt_base> pmt_t; +typedef std::shared_ptr<pmt_base> pmt_t; class PMT_API exception : public std::logic_error { @@ -703,10 +703,10 @@ PMT_API void any_set(pmt_t obj, const boost::any& any); PMT_API bool is_msg_accepter(const pmt_t& obj); //! make a msg_accepter -PMT_API pmt_t make_msg_accepter(boost::shared_ptr<gr::messages::msg_accepter> ma); +PMT_API pmt_t make_msg_accepter(std::shared_ptr<gr::messages::msg_accepter> ma); //! Return underlying msg_accepter -PMT_API boost::shared_ptr<gr::messages::msg_accepter> msg_accepter_ref(const pmt_t& obj); +PMT_API std::shared_ptr<gr::messages::msg_accepter> msg_accepter_ref(const pmt_t& obj); /* * ------------------------------------------------------------------------ diff --git a/gnuradio-runtime/include/pmt/pmt_sugar.h b/gnuradio-runtime/include/pmt/pmt_sugar.h index f6c5221cc2..78d3f012af 100644 --- a/gnuradio-runtime/include/pmt/pmt_sugar.h +++ b/gnuradio-runtime/include/pmt/pmt_sugar.h @@ -54,7 +54,7 @@ static inline pmt_t mp(std::complex<float> z) } //! Make pmt msg_accepter -static inline pmt_t mp(boost::shared_ptr<gr::messages::msg_accepter> ma) +static inline pmt_t mp(std::shared_ptr<gr::messages::msg_accepter> ma) { return make_msg_accepter(ma); } diff --git a/gnuradio-runtime/lib/basic_block.cc b/gnuradio-runtime/lib/basic_block.cc index 88ad63cf39..f86051213c 100644 --- a/gnuradio-runtime/lib/basic_block.cc +++ b/gnuradio-runtime/lib/basic_block.cc @@ -75,7 +75,7 @@ void basic_block::message_port_register_in(pmt::pmt_t port_id) } msg_queue[port_id] = msg_queue_t(); msg_queue_ready[port_id] = - boost::shared_ptr<boost::condition_variable>(new boost::condition_variable()); + std::shared_ptr<boost::condition_variable>(new boost::condition_variable()); } pmt::pmt_t basic_block::message_ports_in() diff --git a/gnuradio-runtime/lib/buffer.cc b/gnuradio-runtime/lib/buffer.cc index 7564741934..91cc43818b 100644 --- a/gnuradio-runtime/lib/buffer.cc +++ b/gnuradio-runtime/lib/buffer.cc @@ -47,7 +47,7 @@ static long s_buffer_reader_count = 0; both want pointers to each other, and unless we do something, we'll never delete any of them because of the circular structure. They'll always have a reference count of at least one. We could - use boost::weak_ptr's from gr::buffer to gr::buffer_reader but that + use std::weak_ptr's from gr::buffer to gr::buffer_reader but that introduces it's own problems. (gr::buffer_reader's destructor needs to call gr::buffer::drop_reader, but has no easy way to get a shared_ptr to itself.) diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc b/gnuradio-runtime/lib/controlport/rpcmanager.cc index 0699fa46c2..cd911a8fda 100644 --- a/gnuradio-runtime/lib/controlport/rpcmanager.cc +++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc @@ -9,6 +9,7 @@ */ #include <gnuradio/rpcmanager.h> +#include <cassert> #include <iostream> #include <stdexcept> diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc index bca30c5053..4102191a3d 100644 --- a/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc +++ b/gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc @@ -79,7 +79,7 @@ const unsigned int thrift_application_base<rpcserver_base, rpcserver_booter_thri d_default_thrift_buffer_size(ALRIGHT_DEFAULT_BUFFER_SIZE); template <class rpcserver_base, class rpcserver_booter_thrift> -boost::scoped_ptr<thrift_application_base_impl> +std::unique_ptr<thrift_application_base_impl> thrift_application_base<rpcserver_base, rpcserver_booter_thrift>::p_impl( new thrift_application_base_impl()); diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 02b324cfeb..512cfaa33e 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -581,7 +581,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (set_all_min_buff) { // sets the min buff for every block within hier_block2 if (min_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(b); + block_sptr bb = std::dynamic_pointer_cast<block>(b); if (bb != 0) { if (bb->min_output_buffer(0) != min_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -590,7 +590,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const bb->set_min_output_buffer(min_buff); } } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b); if (hh != 0) { if (hh->min_output_buffer(0) != min_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -606,7 +606,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (set_all_max_buff) { // sets the max buff for every block within hier_block2 if (max_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(b); + block_sptr bb = std::dynamic_pointer_cast<block>(b); if (bb != 0) { if (bb->max_output_buffer(0) != max_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -615,7 +615,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const bb->set_max_output_buffer(max_buff); } } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b); if (hh != 0) { if (hh->max_output_buffer(0) != max_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -633,7 +633,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (set_all_min_buff) { // sets the min buff for every block within hier_block2 if (min_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(b); + block_sptr bb = std::dynamic_pointer_cast<block>(b); if (bb != 0) { if (bb->min_output_buffer(0) != min_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -642,7 +642,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const bb->set_min_output_buffer(min_buff); } } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b); if (hh != 0) { if (hh->min_output_buffer(0) != min_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -658,7 +658,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (set_all_max_buff) { // sets the max buff for every block within hier_block2 if (max_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(b); + block_sptr bb = std::dynamic_pointer_cast<block>(b); if (bb != 0) { if (bb->max_output_buffer(0) != max_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -667,7 +667,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const bb->set_max_output_buffer(max_buff); } } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(b); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b); if (hh != 0) { if (hh->max_output_buffer(0) != max_buff) { if (HIER_BLOCK2_DETAIL_DEBUG) @@ -793,7 +793,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (!set_all_min_buff) { min_buff = d_owner->min_output_buffer(i); if (min_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(blk); + block_sptr bb = std::dynamic_pointer_cast<block>(blk); if (bb != 0) { int bb_src_port = d_outputs[i].port(); if (HIER_BLOCK2_DETAIL_DEBUG) @@ -802,7 +802,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const << std::endl; bb->set_min_output_buffer(bb_src_port, min_buff); } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(blk); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(blk); if (hh != 0) { int hh_src_port = d_outputs[i].port(); if (HIER_BLOCK2_DETAIL_DEBUG) @@ -817,7 +817,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const if (!set_all_max_buff) { max_buff = d_owner->max_output_buffer(i); if (max_buff != 0) { - block_sptr bb = boost::dynamic_pointer_cast<block>(blk); + block_sptr bb = std::dynamic_pointer_cast<block>(blk); if (bb != 0) { int bb_src_port = d_outputs[i].port(); if (HIER_BLOCK2_DETAIL_DEBUG) @@ -826,7 +826,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const << std::endl; bb->set_max_output_buffer(bb_src_port, max_buff); } else { - hier_block2_sptr hh = boost::dynamic_pointer_cast<hier_block2>(blk); + hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(blk); if (hh != 0) { int hh_src_port = d_outputs[i].port(); if (HIER_BLOCK2_DETAIL_DEBUG) diff --git a/gnuradio-runtime/lib/scheduler.h b/gnuradio-runtime/lib/scheduler.h index 448895d72a..e56f0bfb19 100644 --- a/gnuradio-runtime/lib/scheduler.h +++ b/gnuradio-runtime/lib/scheduler.h @@ -19,7 +19,7 @@ namespace gr { class scheduler; -typedef boost::shared_ptr<scheduler> scheduler_sptr; +typedef std::shared_ptr<scheduler> scheduler_sptr; /*! * \brief Abstract scheduler that takes a flattened flow graph and diff --git a/gnuradio-runtime/lib/scheduler_tpb.cc b/gnuradio-runtime/lib/scheduler_tpb.cc index 25fc836b96..f04be4227d 100644 --- a/gnuradio-runtime/lib/scheduler_tpb.cc +++ b/gnuradio-runtime/lib/scheduler_tpb.cc @@ -68,7 +68,7 @@ scheduler_tpb::scheduler_tpb(flat_flowgraph_sptr ffg, } thread::barrier_sptr start_sync = - boost::make_shared<thread::barrier>(blocks.size() + 1); + std::make_shared<thread::barrier>(blocks.size() + 1); // Fire off a thead for each block diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc index f8529cabdf..0dd1f58666 100644 --- a/gnuradio-runtime/lib/sptr_magic.cc +++ b/gnuradio-runtime/lib/sptr_magic.cc @@ -54,7 +54,7 @@ void detail::sptr_magic::cancel_initial_sptr(gr::hier_block2* p) return; /* Not in the map, nothing to do */ gr::basic_block_sptr sptr = pos->second; s_map.erase(pos); - boost::get_deleter<disarmable_deleter, gr::basic_block>(sptr)->disarm(); + std::get_deleter<disarmable_deleter, gr::basic_block>(sptr)->disarm(); } gr::basic_block_sptr detail::sptr_magic::fetch_initial_sptr(gr::basic_block* p) diff --git a/gnuradio-runtime/lib/test.h b/gnuradio-runtime/lib/test.h index 0d7b0cf6cf..ab03231861 100644 --- a/gnuradio-runtime/lib/test.h +++ b/gnuradio-runtime/lib/test.h @@ -19,7 +19,7 @@ namespace gr { class test; -typedef boost::shared_ptr<test> test_sptr; +typedef std::shared_ptr<test> test_sptr; // public constructor GR_RUNTIME_API test_sptr make_test(const std::string& name = std::string("test"), 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 diff --git a/gr-analog/include/gnuradio/analog/agc2_cc.h b/gr-analog/include/gnuradio/analog/agc2_cc.h index d17c960767..6b1c2711dd 100644 --- a/gr-analog/include/gnuradio/analog/agc2_cc.h +++ b/gr-analog/include/gnuradio/analog/agc2_cc.h @@ -30,7 +30,7 @@ class ANALOG_API agc2_cc : virtual public sync_block { public: // gr::analog::agc2_cc::sptr - typedef boost::shared_ptr<agc2_cc> sptr; + typedef std::shared_ptr<agc2_cc> sptr; /*! * Build a complex value AGC loop block with attack and decay rates. diff --git a/gr-analog/include/gnuradio/analog/agc2_ff.h b/gr-analog/include/gnuradio/analog/agc2_ff.h index dd3f0274e7..9f356f3d8f 100644 --- a/gr-analog/include/gnuradio/analog/agc2_ff.h +++ b/gr-analog/include/gnuradio/analog/agc2_ff.h @@ -30,7 +30,7 @@ class ANALOG_API agc2_ff : virtual public sync_block { public: // gr::analog::agc2_ff::sptr - typedef boost::shared_ptr<agc2_ff> sptr; + typedef std::shared_ptr<agc2_ff> sptr; /*! * Build a floating point AGC loop block with attack and decay rates. diff --git a/gr-analog/include/gnuradio/analog/agc3_cc.h b/gr-analog/include/gnuradio/analog/agc3_cc.h index 040b791c75..fd9323dbc8 100644 --- a/gr-analog/include/gnuradio/analog/agc3_cc.h +++ b/gr-analog/include/gnuradio/analog/agc3_cc.h @@ -33,7 +33,7 @@ class ANALOG_API agc3_cc : virtual public sync_block { public: // gr::analog::agc3_cc::sptr - typedef boost::shared_ptr<agc3_cc> sptr; + typedef std::shared_ptr<agc3_cc> sptr; /*! * Build a complex value AGC loop block with attack and decay rates. diff --git a/gr-analog/include/gnuradio/analog/agc_cc.h b/gr-analog/include/gnuradio/analog/agc_cc.h index 3920bbc7db..c2c04a0c64 100644 --- a/gr-analog/include/gnuradio/analog/agc_cc.h +++ b/gr-analog/include/gnuradio/analog/agc_cc.h @@ -29,7 +29,7 @@ class ANALOG_API agc_cc : virtual public sync_block { public: // gr::analog::agc_cc::sptr - typedef boost::shared_ptr<agc_cc> sptr; + typedef std::shared_ptr<agc_cc> sptr; /*! * Build a complex value AGC loop block. diff --git a/gr-analog/include/gnuradio/analog/agc_ff.h b/gr-analog/include/gnuradio/analog/agc_ff.h index 53b30b04ee..7668b6a11c 100644 --- a/gr-analog/include/gnuradio/analog/agc_ff.h +++ b/gr-analog/include/gnuradio/analog/agc_ff.h @@ -29,7 +29,7 @@ class ANALOG_API agc_ff : virtual public sync_block { public: // gr::analog::agc_ff::sptr - typedef boost::shared_ptr<agc_ff> sptr; + typedef std::shared_ptr<agc_ff> sptr; /*! * Build a floating point AGC loop block. diff --git a/gr-analog/include/gnuradio/analog/cpfsk_bc.h b/gr-analog/include/gnuradio/analog/cpfsk_bc.h index 9329840b26..e5acf18c89 100644 --- a/gr-analog/include/gnuradio/analog/cpfsk_bc.h +++ b/gr-analog/include/gnuradio/analog/cpfsk_bc.h @@ -25,7 +25,7 @@ class ANALOG_API cpfsk_bc : virtual public sync_interpolator { public: // gr::analog::cpfsk_bc::sptr - typedef boost::shared_ptr<cpfsk_bc> sptr; + typedef std::shared_ptr<cpfsk_bc> sptr; /*! * \brief Make a CPFSK block. diff --git a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h index 72d5a930bd..4e7059cdb4 100644 --- a/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/ctcss_squelch_ff.h @@ -30,7 +30,7 @@ protected: public: // gr::analog::ctcss_squelch_ff::sptr - typedef boost::shared_ptr<ctcss_squelch_ff> sptr; + typedef std::shared_ptr<ctcss_squelch_ff> sptr; /*! * \brief Make CTCSS tone squelch block. diff --git a/gr-analog/include/gnuradio/analog/dpll_bb.h b/gr-analog/include/gnuradio/analog/dpll_bb.h index 41c4b0ee25..042acf9187 100644 --- a/gr-analog/include/gnuradio/analog/dpll_bb.h +++ b/gr-analog/include/gnuradio/analog/dpll_bb.h @@ -29,7 +29,7 @@ class ANALOG_API dpll_bb : virtual public sync_block { public: // gr::analog::dpll_bb::sptr - typedef boost::shared_ptr<dpll_bb> sptr; + typedef std::shared_ptr<dpll_bb> sptr; static sptr make(float period, float gain); diff --git a/gr-analog/include/gnuradio/analog/fastnoise_source.h b/gr-analog/include/gnuradio/analog/fastnoise_source.h index 93f6d6498d..8edc8d972d 100644 --- a/gr-analog/include/gnuradio/analog/fastnoise_source.h +++ b/gr-analog/include/gnuradio/analog/fastnoise_source.h @@ -34,7 +34,7 @@ class ANALOG_API fastnoise_source : virtual public sync_block { public: // gr::analog::fastnoise_source::sptr - typedef boost::shared_ptr<fastnoise_source<T>> sptr; + typedef std::shared_ptr<fastnoise_source<T>> sptr; /*! \brief Make a fast noise source * \param type the random distribution to use (see diff --git a/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h index c4ac191793..d3b1681758 100644 --- a/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h +++ b/gr-analog/include/gnuradio/analog/feedforward_agc_cc.h @@ -26,7 +26,7 @@ class ANALOG_API feedforward_agc_cc : virtual public sync_block { public: // gr::analog::feedforward_agc_cc::sptr - typedef boost::shared_ptr<feedforward_agc_cc> sptr; + typedef std::shared_ptr<feedforward_agc_cc> sptr; /*! * Build a complex valued feed-forward AGC loop block. diff --git a/gr-analog/include/gnuradio/analog/fmdet_cf.h b/gr-analog/include/gnuradio/analog/fmdet_cf.h index 6c94d11967..fda377e29d 100644 --- a/gr-analog/include/gnuradio/analog/fmdet_cf.h +++ b/gr-analog/include/gnuradio/analog/fmdet_cf.h @@ -31,7 +31,7 @@ class ANALOG_API fmdet_cf : virtual public sync_block { public: // gr::analog::fmdet_cf::sptr - typedef boost::shared_ptr<fmdet_cf> sptr; + typedef std::shared_ptr<fmdet_cf> sptr; /*! * \brief Make FM detector block. diff --git a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h index 443e393fe0..67565ed2c1 100644 --- a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h @@ -51,7 +51,7 @@ class ANALOG_API frequency_modulator_fc : virtual public sync_block { public: // gr::analog::frequency_modulator_fc::sptr - typedef boost::shared_ptr<frequency_modulator_fc> sptr; + typedef std::shared_ptr<frequency_modulator_fc> sptr; /*! * Build a frequency modulator block. diff --git a/gr-analog/include/gnuradio/analog/noise_source.h b/gr-analog/include/gnuradio/analog/noise_source.h index c90ecd63b9..4484587a72 100644 --- a/gr-analog/include/gnuradio/analog/noise_source.h +++ b/gr-analog/include/gnuradio/analog/noise_source.h @@ -32,7 +32,7 @@ class ANALOG_API noise_source : virtual public sync_block { public: // gr::analog::noise_source::sptr - typedef boost::shared_ptr<noise_source<T>> sptr; + typedef std::shared_ptr<noise_source<T>> sptr; /*! Build a noise source * \param type the random distribution to use (see diff --git a/gr-analog/include/gnuradio/analog/phase_modulator_fc.h b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h index 6e61b9c471..527a70e27b 100644 --- a/gr-analog/include/gnuradio/analog/phase_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/phase_modulator_fc.h @@ -31,7 +31,7 @@ class ANALOG_API phase_modulator_fc : virtual public sync_block { public: // gr::analog::phase_modulator_fc::sptr - typedef boost::shared_ptr<phase_modulator_fc> sptr; + typedef std::shared_ptr<phase_modulator_fc> sptr; /* \brief Make a phase modulator block. * diff --git a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h index c3a6a3ef57..5171bd37aa 100644 --- a/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_carriertracking_cc.h @@ -40,7 +40,7 @@ class ANALOG_API pll_carriertracking_cc : virtual public sync_block, { public: // gr::analog::pll_carriertracking_cc::sptr - typedef boost::shared_ptr<pll_carriertracking_cc> sptr; + typedef std::shared_ptr<pll_carriertracking_cc> sptr; /* \brief Make a carrier tracking PLL block. * diff --git a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h index c110335552..4c04fafef3 100644 --- a/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h +++ b/gr-analog/include/gnuradio/analog/pll_freqdet_cf.h @@ -39,7 +39,7 @@ class ANALOG_API pll_freqdet_cf : virtual public sync_block, { public: // gr::analog::pll_freqdet_cf::sptr - typedef boost::shared_ptr<pll_freqdet_cf> sptr; + typedef std::shared_ptr<pll_freqdet_cf> sptr; /* \brief Make PLL block that outputs the tracked signal's frequency. * diff --git a/gr-analog/include/gnuradio/analog/pll_refout_cc.h b/gr-analog/include/gnuradio/analog/pll_refout_cc.h index bb0769b566..3ca915d645 100644 --- a/gr-analog/include/gnuradio/analog/pll_refout_cc.h +++ b/gr-analog/include/gnuradio/analog/pll_refout_cc.h @@ -40,7 +40,7 @@ class ANALOG_API pll_refout_cc : virtual public sync_block, { public: // gr::analog::pll_refout_cc::sptr - typedef boost::shared_ptr<pll_refout_cc> sptr; + typedef std::shared_ptr<pll_refout_cc> sptr; /* \brief Make PLL block that outputs the tracked carrier signal. * diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h index 13007ba89b..b659454c6b 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_c.h @@ -32,7 +32,7 @@ class ANALOG_API probe_avg_mag_sqrd_c : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_c::sptr - typedef boost::shared_ptr<probe_avg_mag_sqrd_c> sptr; + typedef std::shared_ptr<probe_avg_mag_sqrd_c> sptr; /*! * \brief Make a complex sink that computes avg magnitude squared. diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h index 148ed8fa94..43cbcee622 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_cf.h @@ -34,7 +34,7 @@ class ANALOG_API probe_avg_mag_sqrd_cf : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_cf::sptr - typedef boost::shared_ptr<probe_avg_mag_sqrd_cf> sptr; + typedef std::shared_ptr<probe_avg_mag_sqrd_cf> sptr; /*! * \brief Make a block that computes avg magnitude squared. diff --git a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h index cee62c54cc..e2ba12fc77 100644 --- a/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h +++ b/gr-analog/include/gnuradio/analog/probe_avg_mag_sqrd_f.h @@ -33,7 +33,7 @@ class ANALOG_API probe_avg_mag_sqrd_f : virtual public sync_block { public: // gr::analog::probe_avg_mag_sqrd_f::sptr - typedef boost::shared_ptr<probe_avg_mag_sqrd_f> sptr; + typedef std::shared_ptr<probe_avg_mag_sqrd_f> sptr; /*! * \brief Make a float sink that computes avg magnitude squared. diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h index c1aaea60f6..bf2ecc7331 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_cc.h @@ -30,7 +30,7 @@ protected: public: // gr::analog::pwr_squelch_cc::sptr - typedef boost::shared_ptr<pwr_squelch_cc> sptr; + typedef std::shared_ptr<pwr_squelch_cc> sptr; /*! * \brief Make power-based squelch block. diff --git a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h index 212cf0e0cf..d19b45e15d 100644 --- a/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h +++ b/gr-analog/include/gnuradio/analog/pwr_squelch_ff.h @@ -30,7 +30,7 @@ protected: public: // gr::analog::pwr_squelch_ff::sptr - typedef boost::shared_ptr<pwr_squelch_ff> sptr; + typedef std::shared_ptr<pwr_squelch_ff> sptr; /*! * \brief Make power-based squelch block. diff --git a/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h index 2e99d3ca3e..88212de166 100644 --- a/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h +++ b/gr-analog/include/gnuradio/analog/quadrature_demod_cf.h @@ -61,7 +61,7 @@ class ANALOG_API quadrature_demod_cf : virtual public sync_block { public: // gr::analog::quadrature_demod_cf::sptr - typedef boost::shared_ptr<quadrature_demod_cf> sptr; + typedef std::shared_ptr<quadrature_demod_cf> sptr; /* \brief Make a quadrature demodulator block. * diff --git a/gr-analog/include/gnuradio/analog/rail_ff.h b/gr-analog/include/gnuradio/analog/rail_ff.h index 180c4eba5a..bc08cc3ce8 100644 --- a/gr-analog/include/gnuradio/analog/rail_ff.h +++ b/gr-analog/include/gnuradio/analog/rail_ff.h @@ -25,7 +25,7 @@ class ANALOG_API rail_ff : virtual public sync_block { public: // gr::analog::rail_ff::sptr - typedef boost::shared_ptr<rail_ff> sptr; + typedef std::shared_ptr<rail_ff> sptr; /*! * Build a rail block. diff --git a/gr-analog/include/gnuradio/analog/random_uniform_source.h b/gr-analog/include/gnuradio/analog/random_uniform_source.h index cde93d647b..b62653a6a0 100644 --- a/gr-analog/include/gnuradio/analog/random_uniform_source.h +++ b/gr-analog/include/gnuradio/analog/random_uniform_source.h @@ -27,7 +27,7 @@ class ANALOG_API random_uniform_source : virtual public sync_block { public: // gr::analog::random_uniform_source::sptr - typedef boost::shared_ptr<random_uniform_source<T>> sptr; + typedef std::shared_ptr<random_uniform_source<T>> sptr; /*! * \brief Return a shared_ptr to a new instance of analog::random_uniform_source_X. diff --git a/gr-analog/include/gnuradio/analog/sig_source.h b/gr-analog/include/gnuradio/analog/sig_source.h index 168c12a5bd..0a7d307e21 100644 --- a/gr-analog/include/gnuradio/analog/sig_source.h +++ b/gr-analog/include/gnuradio/analog/sig_source.h @@ -28,7 +28,7 @@ class ANALOG_API sig_source : virtual public sync_block { public: // gr::analog::sig_source::sptr - typedef boost::shared_ptr<sig_source<T>> sptr; + typedef std::shared_ptr<sig_source<T>> sptr; /*! * Build a signal source block. diff --git a/gr-analog/include/gnuradio/analog/simple_squelch_cc.h b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h index cd8afdf0f8..cb9979496e 100644 --- a/gr-analog/include/gnuradio/analog/simple_squelch_cc.h +++ b/gr-analog/include/gnuradio/analog/simple_squelch_cc.h @@ -25,7 +25,7 @@ class ANALOG_API simple_squelch_cc : virtual public sync_block { public: // gr::analog::simple_squelch_cc::sptr - typedef boost::shared_ptr<simple_squelch_cc> sptr; + typedef std::shared_ptr<simple_squelch_cc> sptr; /*! * \brief Make a simple squelch block. diff --git a/gr-audio/include/gnuradio/audio/sink.h b/gr-audio/include/gnuradio/audio/sink.h index e9dc0eec0d..b01b69216d 100644 --- a/gr-audio/include/gnuradio/audio/sink.h +++ b/gr-audio/include/gnuradio/audio/sink.h @@ -24,7 +24,7 @@ namespace audio { class GR_AUDIO_API sink : virtual public sync_block { public: - typedef boost::shared_ptr<sink> sptr; + typedef std::shared_ptr<sink> sptr; /*! * Creates a sink from an audio device at a specified diff --git a/gr-audio/include/gnuradio/audio/source.h b/gr-audio/include/gnuradio/audio/source.h index 4daa0f8940..30948432ad 100644 --- a/gr-audio/include/gnuradio/audio/source.h +++ b/gr-audio/include/gnuradio/audio/source.h @@ -24,7 +24,7 @@ namespace audio { class GR_AUDIO_API source : virtual public sync_block { public: - typedef boost::shared_ptr<source> sptr; + typedef std::shared_ptr<source> sptr; /*! * Creates a source from an audio device at a specified diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h index 942a20bf69..34d1a4f3bf 100644 --- a/gr-audio/lib/alsa/alsa_source.h +++ b/gr-audio/lib/alsa/alsa_source.h @@ -24,7 +24,7 @@ namespace gr { namespace audio { class alsa_source; -typedef boost::shared_ptr<alsa_source> alsa_source_sptr; +typedef std::shared_ptr<alsa_source> alsa_source_sptr; /*! * \brief audio source using ALSA diff --git a/gr-audio/lib/portaudio/portaudio_sink.cc b/gr-audio/lib/portaudio/portaudio_sink.cc index 905fbdb916..f19936e773 100644 --- a/gr-audio/lib/portaudio/portaudio_sink.cc +++ b/gr-audio/lib/portaudio/portaudio_sink.cc @@ -231,8 +231,8 @@ bool portaudio_sink::check_topology(int ninputs, int noutputs) if (Pa_IsStreamActive(d_stream)) { Pa_CloseStream(d_stream); d_stream = 0; - d_reader.reset(); // boost::shared_ptr for d_reader = 0 - d_writer.reset(); // boost::shared_ptr for d_write = 0 + d_reader.reset(); // std::shared_ptr for d_reader = 0 + d_writer.reset(); // std::shared_ptr for d_write = 0 } d_output_parameters.channelCount = ninputs; // # of channels we're really using diff --git a/gr-audio/lib/portaudio/portaudio_source.cc b/gr-audio/lib/portaudio/portaudio_source.cc index 0543ce94c0..7f5b2aeb15 100644 --- a/gr-audio/lib/portaudio/portaudio_source.cc +++ b/gr-audio/lib/portaudio/portaudio_source.cc @@ -227,8 +227,8 @@ bool portaudio_source::check_topology(int ninputs, int noutputs) if (Pa_IsStreamActive(d_stream)) { Pa_CloseStream(d_stream); d_stream = 0; - d_reader.reset(); // boost::shared_ptr for d_reader = 0 - d_writer.reset(); // boost::shared_ptr for d_write = 0 + d_reader.reset(); // std::shared_ptr for d_reader = 0 + d_writer.reset(); // std::shared_ptr for d_write = 0 } d_input_parameters.channelCount = noutputs; // # of channels we're really using diff --git a/gr-blocks/include/gnuradio/blocks/abs_blk.h b/gr-blocks/include/gnuradio/blocks/abs_blk.h index ca6ea75766..9db6f89da3 100644 --- a/gr-blocks/include/gnuradio/blocks/abs_blk.h +++ b/gr-blocks/include/gnuradio/blocks/abs_blk.h @@ -32,7 +32,7 @@ class BLOCKS_API abs_blk : virtual public sync_block public: // gr::blocks::abs_blk::sptr - typedef boost::shared_ptr<abs_blk<T>> sptr; + typedef std::shared_ptr<abs_blk<T>> sptr; /*! * \brief Create an instance of abs_blk diff --git a/gr-blocks/include/gnuradio/blocks/add_blk.h b/gr-blocks/include/gnuradio/blocks/add_blk.h index 9ea552805f..6209dc8098 100644 --- a/gr-blocks/include/gnuradio/blocks/add_blk.h +++ b/gr-blocks/include/gnuradio/blocks/add_blk.h @@ -36,7 +36,7 @@ class BLOCKS_API add_blk : virtual public sync_block { public: // gr::blocks::add_blk::sptr - typedef boost::shared_ptr<add_blk<T>> sptr; + typedef std::shared_ptr<add_blk<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/add_const_bb.h b/gr-blocks/include/gnuradio/blocks/add_const_bb.h index 4d5044ee34..593a46702d 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_bb.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_bb.h @@ -25,7 +25,7 @@ class BLOCKS_API add_const_bb : virtual public sync_block { public: // gr::blocks::add_const_bb::sptr - typedef boost::shared_ptr<add_const_bb> sptr; + typedef std::shared_ptr<add_const_bb> sptr; /*! * \brief Create an instance of add_const_bb diff --git a/gr-blocks/include/gnuradio/blocks/add_const_cc.h b/gr-blocks/include/gnuradio/blocks/add_const_cc.h index 2ac830dd9e..a33e18e70a 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_cc.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_cc.h @@ -26,7 +26,7 @@ class BLOCKS_API add_const_cc : virtual public sync_block { public: // gr::blocks::add_const_cc::sptr - typedef boost::shared_ptr<add_const_cc> sptr; + typedef std::shared_ptr<add_const_cc> sptr; /*! * \brief Create an instance of add_const_cc diff --git a/gr-blocks/include/gnuradio/blocks/add_const_ff.h b/gr-blocks/include/gnuradio/blocks/add_const_ff.h index ac594ca3a3..d2e01c27da 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_ff.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_ff.h @@ -26,7 +26,7 @@ class BLOCKS_API add_const_ff : virtual public sync_block { public: // gr::blocks::add_const_ff::sptr - typedef boost::shared_ptr<add_const_ff> sptr; + typedef std::shared_ptr<add_const_ff> sptr; /*! * \brief Create an instance of add_const_ff diff --git a/gr-blocks/include/gnuradio/blocks/add_const_ii.h b/gr-blocks/include/gnuradio/blocks/add_const_ii.h index 939b4ee6da..3855c0b624 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_ii.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_ii.h @@ -25,7 +25,7 @@ class BLOCKS_API add_const_ii : virtual public sync_block { public: // gr::blocks::add_const_ii::sptr - typedef boost::shared_ptr<add_const_ii> sptr; + typedef std::shared_ptr<add_const_ii> sptr; /*! * \brief Create an instance of add_const_ii diff --git a/gr-blocks/include/gnuradio/blocks/add_const_ss.h b/gr-blocks/include/gnuradio/blocks/add_const_ss.h index 66d34d1dd9..36701756e4 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_ss.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_ss.h @@ -25,7 +25,7 @@ class BLOCKS_API add_const_ss : virtual public sync_block { public: // gr::blocks::add_const_ss::sptr - typedef boost::shared_ptr<add_const_ss> sptr; + typedef std::shared_ptr<add_const_ss> sptr; /*! * \brief Create an instance of add_const_ss diff --git a/gr-blocks/include/gnuradio/blocks/add_const_v.h b/gr-blocks/include/gnuradio/blocks/add_const_v.h index 90ff2638a9..03a414442b 100644 --- a/gr-blocks/include/gnuradio/blocks/add_const_v.h +++ b/gr-blocks/include/gnuradio/blocks/add_const_v.h @@ -27,7 +27,7 @@ class BLOCKS_API add_const_v : virtual public sync_block { public: - typedef boost::shared_ptr<add_const_v<T>> sptr; + typedef std::shared_ptr<add_const_v<T>> sptr; /*! * \brief Create an instance of add_const_v diff --git a/gr-blocks/include/gnuradio/blocks/and_blk.h b/gr-blocks/include/gnuradio/blocks/and_blk.h index 63920f1101..0331092048 100644 --- a/gr-blocks/include/gnuradio/blocks/and_blk.h +++ b/gr-blocks/include/gnuradio/blocks/and_blk.h @@ -31,7 +31,7 @@ class BLOCKS_API and_blk : virtual public sync_block { public: // gr::blocks::and_blk::sptr - typedef boost::shared_ptr<and_blk<T>> sptr; + typedef std::shared_ptr<and_blk<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/and_const.h b/gr-blocks/include/gnuradio/blocks/and_const.h index ddd00cb18f..094acb3bfb 100644 --- a/gr-blocks/include/gnuradio/blocks/and_const.h +++ b/gr-blocks/include/gnuradio/blocks/and_const.h @@ -32,7 +32,7 @@ class BLOCKS_API and_const : virtual public sync_block public: // gr::blocks::and_const::sptr - typedef boost::shared_ptr<and_const<T>> sptr; + typedef std::shared_ptr<and_const<T>> sptr; /*! * \brief Create an instance of and_const diff --git a/gr-blocks/include/gnuradio/blocks/annotator_1to1.h b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h index ce7ba2428a..e964e42d99 100644 --- a/gr-blocks/include/gnuradio/blocks/annotator_1to1.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_1to1.h @@ -38,7 +38,7 @@ class BLOCKS_API annotator_1to1 : virtual public sync_block { public: // gr::blocks::annotator_1to1::sptr - typedef boost::shared_ptr<annotator_1to1> sptr; + typedef std::shared_ptr<annotator_1to1> sptr; static sptr make(int when, size_t sizeof_stream_item); diff --git a/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h index e7e7bd03ec..1ee66ad0ac 100644 --- a/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_alltoall.h @@ -38,7 +38,7 @@ class BLOCKS_API annotator_alltoall : virtual public sync_block { public: // gr::blocks::annotator_alltoall::sptr - typedef boost::shared_ptr<annotator_alltoall> sptr; + typedef std::shared_ptr<annotator_alltoall> sptr; static sptr make(int when, size_t sizeof_stream_item); diff --git a/gr-blocks/include/gnuradio/blocks/annotator_raw.h b/gr-blocks/include/gnuradio/blocks/annotator_raw.h index fd64f0fc41..92dd7a370e 100644 --- a/gr-blocks/include/gnuradio/blocks/annotator_raw.h +++ b/gr-blocks/include/gnuradio/blocks/annotator_raw.h @@ -33,7 +33,7 @@ class BLOCKS_API annotator_raw : virtual public sync_block { public: // gr::blocks::annotator_raw::sptr - typedef boost::shared_ptr<annotator_raw> sptr; + typedef std::shared_ptr<annotator_raw> sptr; static sptr make(size_t sizeof_stream_item); diff --git a/gr-blocks/include/gnuradio/blocks/argmax.h b/gr-blocks/include/gnuradio/blocks/argmax.h index bc0edf300b..48d8d0503d 100644 --- a/gr-blocks/include/gnuradio/blocks/argmax.h +++ b/gr-blocks/include/gnuradio/blocks/argmax.h @@ -39,7 +39,7 @@ template <class T> class BLOCKS_API argmax : virtual public sync_block { public: - typedef boost::shared_ptr<argmax<T>> sptr; + typedef std::shared_ptr<argmax<T>> sptr; static sptr make(size_t vlen); }; diff --git a/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h index cb4224b931..5eb95a2cfd 100644 --- a/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h +++ b/gr-blocks/include/gnuradio/blocks/bin_statistics_f.h @@ -38,7 +38,7 @@ protected: public: // gr::blocks::bin_statistics_f::sptr - typedef boost::shared_ptr<bin_statistics_f> sptr; + typedef std::shared_ptr<bin_statistics_f> sptr; /*! * Build a bin statistics block. See qa_bin_statistics.py and diff --git a/gr-blocks/include/gnuradio/blocks/burst_tagger.h b/gr-blocks/include/gnuradio/blocks/burst_tagger.h index 05c4fec7ef..3fc4a87189 100644 --- a/gr-blocks/include/gnuradio/blocks/burst_tagger.h +++ b/gr-blocks/include/gnuradio/blocks/burst_tagger.h @@ -36,7 +36,7 @@ class BLOCKS_API burst_tagger : virtual public sync_block { public: // gr::blocks::burst_tagger::sptr - typedef boost::shared_ptr<burst_tagger> sptr; + typedef std::shared_ptr<burst_tagger> sptr; /*! * Build a burst tagger gnuradio/blocks. diff --git a/gr-blocks/include/gnuradio/blocks/char_to_float.h b/gr-blocks/include/gnuradio/blocks/char_to_float.h index 45faf44704..fc3712626b 100644 --- a/gr-blocks/include/gnuradio/blocks/char_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_float.h @@ -31,7 +31,7 @@ class BLOCKS_API char_to_float : virtual public sync_block { public: // gr::blocks::char_to_float_ff::sptr - typedef boost::shared_ptr<char_to_float> sptr; + typedef std::shared_ptr<char_to_float> sptr; /*! * Build a chars to float stream converter block. diff --git a/gr-blocks/include/gnuradio/blocks/char_to_short.h b/gr-blocks/include/gnuradio/blocks/char_to_short.h index 866b47f4c6..73d92ee274 100644 --- a/gr-blocks/include/gnuradio/blocks/char_to_short.h +++ b/gr-blocks/include/gnuradio/blocks/char_to_short.h @@ -31,7 +31,7 @@ class BLOCKS_API char_to_short : virtual public sync_block { public: // gr::blocks::char_to_short_ff::sptr - typedef boost::shared_ptr<char_to_short> sptr; + typedef std::shared_ptr<char_to_short> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h index 6c79994c03..dd4000f5b2 100644 --- a/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h +++ b/gr-blocks/include/gnuradio/blocks/check_lfsr_32k_s.h @@ -30,7 +30,7 @@ class BLOCKS_API check_lfsr_32k_s : virtual public sync_block { public: // gr::blocks::check_lfsr_32k_s::sptr - typedef boost::shared_ptr<check_lfsr_32k_s> sptr; + typedef std::shared_ptr<check_lfsr_32k_s> sptr; static sptr make(); diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_arg.h b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h index 1e4b9af8ab..fb551592ba 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_arg.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_arg.h @@ -25,7 +25,7 @@ class BLOCKS_API complex_to_arg : virtual public sync_block { public: // gr::blocks::complex_to_arg_ff::sptr - typedef boost::shared_ptr<complex_to_arg> sptr; + typedef std::shared_ptr<complex_to_arg> sptr; /*! * Build a complex to arg block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_float.h b/gr-blocks/include/gnuradio/blocks/complex_to_float.h index f5ca7317f2..e0f46de6dc 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_float.h @@ -31,7 +31,7 @@ class BLOCKS_API complex_to_float : virtual public sync_block { public: // gr::blocks::complex_to_float_ff::sptr - typedef boost::shared_ptr<complex_to_float> sptr; + typedef std::shared_ptr<complex_to_float> sptr; /*! * Build a complex to float block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_imag.h b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h index 0a5adb1bf3..ce92dc4061 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_imag.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_imag.h @@ -25,7 +25,7 @@ class BLOCKS_API complex_to_imag : virtual public sync_block { public: // gr::blocks::complex_to_imag_ff::sptr - typedef boost::shared_ptr<complex_to_imag> sptr; + typedef std::shared_ptr<complex_to_imag> sptr; /*! * Build a complex to imaginary part block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_char.h b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_char.h index 38f6a4042b..705d2f6ce4 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_char.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_char.h @@ -34,7 +34,7 @@ class BLOCKS_API complex_to_interleaved_char : virtual public sync_interpolator { public: // gr::blocks::complex_to_interleaved_char::sptr - typedef boost::shared_ptr<complex_to_interleaved_char> sptr; + typedef std::shared_ptr<complex_to_interleaved_char> sptr; /*! * Build a complex to interleaved chars block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h index 81c49e3357..1fb9666edb 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_interleaved_short.h @@ -34,7 +34,7 @@ class BLOCKS_API complex_to_interleaved_short : virtual public sync_interpolator { public: // gr::blocks::complex_to_interleaved_short::sptr - typedef boost::shared_ptr<complex_to_interleaved_short> sptr; + typedef std::shared_ptr<complex_to_interleaved_short> sptr; /*! * Build a complex to interleaved shorts block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_mag.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h index a09304217b..c2bfd07d09 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_mag.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag.h @@ -38,7 +38,7 @@ class BLOCKS_API complex_to_mag : virtual public sync_block { public: // gr::blocks::complex_to_mag_ff::sptr - typedef boost::shared_ptr<complex_to_mag> sptr; + typedef std::shared_ptr<complex_to_mag> sptr; /*! * Build a complex to magnitude block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h index f38347e6d4..c95b441115 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_mag_squared.h @@ -38,7 +38,7 @@ class BLOCKS_API complex_to_mag_squared : virtual public sync_block { public: // gr::blocks::complex_to_mag_squared_ff::sptr - typedef boost::shared_ptr<complex_to_mag_squared> sptr; + typedef std::shared_ptr<complex_to_mag_squared> sptr; /*! * Build a complex to magnitude squared block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_magphase.h b/gr-blocks/include/gnuradio/blocks/complex_to_magphase.h index 46c4b10b2f..25b8f42d1f 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_magphase.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_magphase.h @@ -29,7 +29,7 @@ class BLOCKS_API complex_to_magphase : virtual public sync_block { public: // gr::blocks::complex_to_magphase_ff::sptr - typedef boost::shared_ptr<complex_to_magphase> sptr; + typedef std::shared_ptr<complex_to_magphase> sptr; /*! * Build a complex to magnitude and phase block. diff --git a/gr-blocks/include/gnuradio/blocks/complex_to_real.h b/gr-blocks/include/gnuradio/blocks/complex_to_real.h index f86b9ae70d..22ef34972c 100644 --- a/gr-blocks/include/gnuradio/blocks/complex_to_real.h +++ b/gr-blocks/include/gnuradio/blocks/complex_to_real.h @@ -25,7 +25,7 @@ class BLOCKS_API complex_to_real : virtual public sync_block { public: // gr::blocks::complex_to_real_ff::sptr - typedef boost::shared_ptr<complex_to_real> sptr; + typedef std::shared_ptr<complex_to_real> sptr; /*! * Build a complex to real part block. diff --git a/gr-blocks/include/gnuradio/blocks/conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h index fac3596217..ff646919f5 100644 --- a/gr-blocks/include/gnuradio/blocks/conjugate_cc.h +++ b/gr-blocks/include/gnuradio/blocks/conjugate_cc.h @@ -25,7 +25,7 @@ class BLOCKS_API conjugate_cc : virtual public sync_block { public: // gr::blocks::conjugate_cc_ff::sptr - typedef boost::shared_ptr<conjugate_cc> sptr; + typedef std::shared_ptr<conjugate_cc> sptr; static sptr make(); }; diff --git a/gr-blocks/include/gnuradio/blocks/copy.h b/gr-blocks/include/gnuradio/blocks/copy.h index 9718d67288..9d36609d7f 100644 --- a/gr-blocks/include/gnuradio/blocks/copy.h +++ b/gr-blocks/include/gnuradio/blocks/copy.h @@ -35,7 +35,7 @@ class BLOCKS_API copy : virtual public block { public: // gr::blocks::copy::sptr - typedef boost::shared_ptr<copy> sptr; + typedef std::shared_ptr<copy> sptr; static sptr make(size_t itemsize); diff --git a/gr-blocks/include/gnuradio/blocks/correctiq.h b/gr-blocks/include/gnuradio/blocks/correctiq.h index f7ebe497c4..3d466364c8 100644 --- a/gr-blocks/include/gnuradio/blocks/correctiq.h +++ b/gr-blocks/include/gnuradio/blocks/correctiq.h @@ -25,7 +25,7 @@ namespace blocks { class BLOCKS_API correctiq : virtual public gr::sync_block { public: - typedef boost::shared_ptr<correctiq> sptr; + typedef std::shared_ptr<correctiq> sptr; /*! * \brief Return a shared_ptr to a new instance of correctiq::correctiq. diff --git a/gr-blocks/include/gnuradio/blocks/correctiq_auto.h b/gr-blocks/include/gnuradio/blocks/correctiq_auto.h index 128c3cdf6b..2ae9864b58 100644 --- a/gr-blocks/include/gnuradio/blocks/correctiq_auto.h +++ b/gr-blocks/include/gnuradio/blocks/correctiq_auto.h @@ -29,7 +29,7 @@ namespace blocks { class BLOCKS_API correctiq_auto : virtual public gr::sync_block { public: - typedef boost::shared_ptr<correctiq_auto> sptr; + typedef std::shared_ptr<correctiq_auto> sptr; /*! * \brief Return a shared_ptr to a new instance of correctiq::correctiq_auto. diff --git a/gr-blocks/include/gnuradio/blocks/correctiq_man.h b/gr-blocks/include/gnuradio/blocks/correctiq_man.h index 0d46f0c0b9..a9cf6f85aa 100644 --- a/gr-blocks/include/gnuradio/blocks/correctiq_man.h +++ b/gr-blocks/include/gnuradio/blocks/correctiq_man.h @@ -27,7 +27,7 @@ namespace blocks { class BLOCKS_API correctiq_man : virtual public gr::sync_block { public: - typedef boost::shared_ptr<correctiq_man> sptr; + typedef std::shared_ptr<correctiq_man> sptr; /*! * \brief Return a shared_ptr to a new instance of correctiq::correctiq_man. diff --git a/gr-blocks/include/gnuradio/blocks/correctiq_swapiq.h b/gr-blocks/include/gnuradio/blocks/correctiq_swapiq.h index 35a18649b4..34675c4eca 100644 --- a/gr-blocks/include/gnuradio/blocks/correctiq_swapiq.h +++ b/gr-blocks/include/gnuradio/blocks/correctiq_swapiq.h @@ -26,7 +26,7 @@ namespace blocks { class BLOCKS_API swap_iq : virtual public gr::sync_block { public: - typedef boost::shared_ptr<swap_iq> sptr; + typedef std::shared_ptr<swap_iq> sptr; /*! * \brief Return a shared_ptr to a new instance of correctiq::swap_iq. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_b.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_b.h index 0a6526645b..7847407f7f 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_b.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_b.h @@ -32,7 +32,7 @@ class BLOCKS_API ctrlport_probe2_b : virtual public sync_block { public: // gr::blocks::ctrlport_probe2_b::sptr - typedef boost::shared_ptr<ctrlport_probe2_b> sptr; + typedef std::shared_ptr<ctrlport_probe2_b> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h index 7989d58bd3..1dabc68e1e 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_c.h @@ -32,7 +32,7 @@ class BLOCKS_API ctrlport_probe2_c : virtual public sync_block { public: // gr::blocks::ctrlport_probe2_c::sptr - typedef boost::shared_ptr<ctrlport_probe2_c> sptr; + typedef std::shared_ptr<ctrlport_probe2_c> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_f.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_f.h index 6a4cf238a1..d16bc4c328 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_f.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_f.h @@ -32,7 +32,7 @@ class BLOCKS_API ctrlport_probe2_f : virtual public sync_block { public: // gr::blocks::ctrlport_probe2_f::sptr - typedef boost::shared_ptr<ctrlport_probe2_f> sptr; + typedef std::shared_ptr<ctrlport_probe2_f> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_i.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_i.h index cb3c3324ea..be994bea14 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_i.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_i.h @@ -32,7 +32,7 @@ class BLOCKS_API ctrlport_probe2_i : virtual public sync_block { public: // gr::blocks::ctrlport_probe2_i::sptr - typedef boost::shared_ptr<ctrlport_probe2_i> sptr; + typedef std::shared_ptr<ctrlport_probe2_i> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_s.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_s.h index b72817ee85..1c86f0e631 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_s.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe2_s.h @@ -32,7 +32,7 @@ class BLOCKS_API ctrlport_probe2_s : virtual public sync_block { public: // gr::blocks::ctrlport_probe2_s::sptr - typedef boost::shared_ptr<ctrlport_probe2_s> sptr; + typedef std::shared_ptr<ctrlport_probe2_s> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h index 36095781be..4415c624a5 100644 --- a/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h +++ b/gr-blocks/include/gnuradio/blocks/ctrlport_probe_c.h @@ -34,7 +34,7 @@ class BLOCKS_API ctrlport_probe_c : virtual public sync_block { public: // gr::blocks::ctrlport_probe_c::sptr - typedef boost::shared_ptr<ctrlport_probe_c> sptr; + typedef std::shared_ptr<ctrlport_probe_c> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-blocks/include/gnuradio/blocks/deinterleave.h b/gr-blocks/include/gnuradio/blocks/deinterleave.h index bba16544c1..9d4b1d952f 100644 --- a/gr-blocks/include/gnuradio/blocks/deinterleave.h +++ b/gr-blocks/include/gnuradio/blocks/deinterleave.h @@ -48,7 +48,7 @@ class BLOCKS_API deinterleave : virtual public block { public: // gr::blocks::deinterleave::sptr - typedef boost::shared_ptr<deinterleave> sptr; + typedef std::shared_ptr<deinterleave> sptr; /*! * Make a deinterleave block. diff --git a/gr-blocks/include/gnuradio/blocks/delay.h b/gr-blocks/include/gnuradio/blocks/delay.h index 604edfc160..46e5bbba8d 100644 --- a/gr-blocks/include/gnuradio/blocks/delay.h +++ b/gr-blocks/include/gnuradio/blocks/delay.h @@ -33,7 +33,7 @@ class BLOCKS_API delay : virtual public block { public: // gr::blocks::delay::sptr - typedef boost::shared_ptr<delay> sptr; + typedef std::shared_ptr<delay> sptr; /*! * \brief Make a delay block. diff --git a/gr-blocks/include/gnuradio/blocks/divide.h b/gr-blocks/include/gnuradio/blocks/divide.h index 9f10dc325d..df5cfaf1df 100644 --- a/gr-blocks/include/gnuradio/blocks/divide.h +++ b/gr-blocks/include/gnuradio/blocks/divide.h @@ -31,7 +31,7 @@ class BLOCKS_API divide : virtual public sync_block { public: // gr::blocks::divide::sptr - typedef boost::shared_ptr<divide<T>> sptr; + typedef std::shared_ptr<divide<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/endian_swap.h b/gr-blocks/include/gnuradio/blocks/endian_swap.h index 57f671d1d9..72f045d71c 100644 --- a/gr-blocks/include/gnuradio/blocks/endian_swap.h +++ b/gr-blocks/include/gnuradio/blocks/endian_swap.h @@ -25,7 +25,7 @@ class BLOCKS_API endian_swap : virtual public sync_block { public: // gr::blocks::endian_swap::sptr - typedef boost::shared_ptr<endian_swap> sptr; + typedef std::shared_ptr<endian_swap> sptr; /*! * Make an endian swap block. diff --git a/gr-blocks/include/gnuradio/blocks/exponentiate_const_cci.h b/gr-blocks/include/gnuradio/blocks/exponentiate_const_cci.h index 6d309f68a3..51cf033e22 100644 --- a/gr-blocks/include/gnuradio/blocks/exponentiate_const_cci.h +++ b/gr-blocks/include/gnuradio/blocks/exponentiate_const_cci.h @@ -34,7 +34,7 @@ namespace blocks { class BLOCKS_API exponentiate_const_cci : virtual public gr::sync_block { public: - typedef boost::shared_ptr<exponentiate_const_cci> sptr; + typedef std::shared_ptr<exponentiate_const_cci> sptr; /* * \param exponent Exponent the input stream is raised to, which must be an integer. diff --git a/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h index f16d7f45fd..9eef8cb7a6 100644 --- a/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_sink.h @@ -25,7 +25,7 @@ class BLOCKS_API file_descriptor_sink : virtual public sync_block { public: // gr::blocks::file_descriptor_sink::sptr - typedef boost::shared_ptr<file_descriptor_sink> sptr; + typedef std::shared_ptr<file_descriptor_sink> sptr; /*! * Build a file descriptor sink block. The provided file descriptor will diff --git a/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h index f9228facba..df692c9ba5 100644 --- a/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_descriptor_source.h @@ -31,7 +31,7 @@ protected: public: // gr::blocks::file_descriptor_source::sptr - typedef boost::shared_ptr<file_descriptor_source> sptr; + typedef std::shared_ptr<file_descriptor_source> sptr; /*! * Build a file descriptor source block. The provided file descriptor will diff --git a/gr-blocks/include/gnuradio/blocks/file_meta_sink.h b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h index 1329c5d9c2..c9154bc20f 100644 --- a/gr-blocks/include/gnuradio/blocks/file_meta_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_meta_sink.h @@ -59,7 +59,7 @@ class BLOCKS_API file_meta_sink : virtual public sync_block { public: // gr::blocks::file_meta_sink::sptr - typedef boost::shared_ptr<file_meta_sink> sptr; + typedef std::shared_ptr<file_meta_sink> sptr; /*! * \brief Create a meta-data file sink. diff --git a/gr-blocks/include/gnuradio/blocks/file_meta_source.h b/gr-blocks/include/gnuradio/blocks/file_meta_source.h index b2bec2c273..73056070c6 100644 --- a/gr-blocks/include/gnuradio/blocks/file_meta_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_meta_source.h @@ -40,7 +40,7 @@ class BLOCKS_API file_meta_source : virtual public sync_block { public: // gr::blocks::file_meta_source::sptr - typedef boost::shared_ptr<file_meta_source> sptr; + typedef std::shared_ptr<file_meta_source> sptr; /*! * \brief Create a meta-data file source. diff --git a/gr-blocks/include/gnuradio/blocks/file_sink.h b/gr-blocks/include/gnuradio/blocks/file_sink.h index bf48deb9e6..84514ab4b6 100644 --- a/gr-blocks/include/gnuradio/blocks/file_sink.h +++ b/gr-blocks/include/gnuradio/blocks/file_sink.h @@ -26,7 +26,7 @@ class BLOCKS_API file_sink : virtual public sync_block, virtual public file_sink { public: // gr::blocks::file_sink::sptr - typedef boost::shared_ptr<file_sink> sptr; + typedef std::shared_ptr<file_sink> sptr; /*! * \brief Make a file sink. diff --git a/gr-blocks/include/gnuradio/blocks/file_source.h b/gr-blocks/include/gnuradio/blocks/file_source.h index a404aa9925..9005cc53fb 100644 --- a/gr-blocks/include/gnuradio/blocks/file_source.h +++ b/gr-blocks/include/gnuradio/blocks/file_source.h @@ -25,7 +25,7 @@ class BLOCKS_API file_source : virtual public sync_block { public: // gr::blocks::file_source::sptr - typedef boost::shared_ptr<file_source> sptr; + typedef std::shared_ptr<file_source> sptr; /*! * \brief Create a file source. diff --git a/gr-blocks/include/gnuradio/blocks/float_to_char.h b/gr-blocks/include/gnuradio/blocks/float_to_char.h index 08090ec666..60c388030f 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_char.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_char.h @@ -25,7 +25,7 @@ class BLOCKS_API float_to_char : virtual public sync_block { public: // gr::blocks::float_to_char_ff::sptr - typedef boost::shared_ptr<float_to_char> sptr; + typedef std::shared_ptr<float_to_char> sptr; /*! * Build a float to char block. diff --git a/gr-blocks/include/gnuradio/blocks/float_to_complex.h b/gr-blocks/include/gnuradio/blocks/float_to_complex.h index d30ccca8e7..3762a221ee 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_complex.h @@ -25,7 +25,7 @@ class BLOCKS_API float_to_complex : virtual public sync_block { public: // gr::blocks::float_to_complex_ff::sptr - typedef boost::shared_ptr<float_to_complex> sptr; + typedef std::shared_ptr<float_to_complex> sptr; /*! * Build a float to complex block. diff --git a/gr-blocks/include/gnuradio/blocks/float_to_int.h b/gr-blocks/include/gnuradio/blocks/float_to_int.h index 1b0fa1a744..37a1466618 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_int.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_int.h @@ -25,7 +25,7 @@ class BLOCKS_API float_to_int : virtual public sync_block { public: // gr::blocks::float_to_int_ff::sptr - typedef boost::shared_ptr<float_to_int> sptr; + typedef std::shared_ptr<float_to_int> sptr; /*! * Build a float to int block. diff --git a/gr-blocks/include/gnuradio/blocks/float_to_short.h b/gr-blocks/include/gnuradio/blocks/float_to_short.h index 313815d7da..97f908f457 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_short.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_short.h @@ -25,7 +25,7 @@ class BLOCKS_API float_to_short : virtual public sync_block { public: // gr::blocks::float_to_short_ff::sptr - typedef boost::shared_ptr<float_to_short> sptr; + typedef std::shared_ptr<float_to_short> sptr; /*! * Build a float to short block. diff --git a/gr-blocks/include/gnuradio/blocks/float_to_uchar.h b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h index 53dada97c8..50296f6a7f 100644 --- a/gr-blocks/include/gnuradio/blocks/float_to_uchar.h +++ b/gr-blocks/include/gnuradio/blocks/float_to_uchar.h @@ -25,7 +25,7 @@ class BLOCKS_API float_to_uchar : virtual public sync_block { public: // gr::blocks::float_to_uchar_ff::sptr - typedef boost::shared_ptr<float_to_uchar> sptr; + typedef std::shared_ptr<float_to_uchar> sptr; /*! * Build a float to uchar block. diff --git a/gr-blocks/include/gnuradio/blocks/head.h b/gr-blocks/include/gnuradio/blocks/head.h index 67192ef00b..be27249f5b 100644 --- a/gr-blocks/include/gnuradio/blocks/head.h +++ b/gr-blocks/include/gnuradio/blocks/head.h @@ -29,7 +29,7 @@ class BLOCKS_API head : virtual public sync_block { public: // gr::blocks::head::sptr - typedef boost::shared_ptr<head> sptr; + typedef std::shared_ptr<head> sptr; static sptr make(size_t sizeof_stream_item, uint64_t nitems); diff --git a/gr-blocks/include/gnuradio/blocks/int_to_float.h b/gr-blocks/include/gnuradio/blocks/int_to_float.h index 13abef9824..261b885c21 100644 --- a/gr-blocks/include/gnuradio/blocks/int_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/int_to_float.h @@ -25,7 +25,7 @@ class BLOCKS_API int_to_float : virtual public sync_block { public: // gr::blocks::int_to_float_ff::sptr - typedef boost::shared_ptr<int_to_float> sptr; + typedef std::shared_ptr<int_to_float> sptr; /*! * Build an int to float block. diff --git a/gr-blocks/include/gnuradio/blocks/integrate.h b/gr-blocks/include/gnuradio/blocks/integrate.h index bb3dd7da86..012db7354b 100644 --- a/gr-blocks/include/gnuradio/blocks/integrate.h +++ b/gr-blocks/include/gnuradio/blocks/integrate.h @@ -28,7 +28,7 @@ class BLOCKS_API integrate : virtual public sync_decimator { public: // gr::blocks::integrate::sptr - typedef boost::shared_ptr<integrate<T>> sptr; + typedef std::shared_ptr<integrate<T>> sptr; static sptr make(int decim, unsigned int vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/interleave.h b/gr-blocks/include/gnuradio/blocks/interleave.h index ef018bb64b..6d120caa0c 100644 --- a/gr-blocks/include/gnuradio/blocks/interleave.h +++ b/gr-blocks/include/gnuradio/blocks/interleave.h @@ -49,7 +49,7 @@ class BLOCKS_API interleave : virtual public block { public: // gr::blocks::interleave::sptr - typedef boost::shared_ptr<interleave> sptr; + typedef std::shared_ptr<interleave> sptr; /*! * Make a stream interleave block. diff --git a/gr-blocks/include/gnuradio/blocks/interleaved_char_to_complex.h b/gr-blocks/include/gnuradio/blocks/interleaved_char_to_complex.h index 6d6c4fce52..6277f1ea9c 100644 --- a/gr-blocks/include/gnuradio/blocks/interleaved_char_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/interleaved_char_to_complex.h @@ -25,7 +25,7 @@ class BLOCKS_API interleaved_char_to_complex : virtual public sync_decimator { public: // gr::blocks::interleaved_char_to_complex::sptr - typedef boost::shared_ptr<interleaved_char_to_complex> sptr; + typedef std::shared_ptr<interleaved_char_to_complex> sptr; /*! * Build an interleaved char to complex block. diff --git a/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h index 8ddfaa6c1a..abaf3c4f00 100644 --- a/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h @@ -25,7 +25,7 @@ class BLOCKS_API interleaved_short_to_complex : virtual public sync_decimator { public: // gr::blocks::interleaved_short_to_complex::sptr - typedef boost::shared_ptr<interleaved_short_to_complex> sptr; + typedef std::shared_ptr<interleaved_short_to_complex> sptr; /*! * Build an interleaved short to complex block. diff --git a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h index 957394e4bf..3ff4aed89b 100644 --- a/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_m_in_n.h @@ -25,7 +25,7 @@ class BLOCKS_API keep_m_in_n : virtual public block { public: // gr::blocks::keep_m_in_n::sptr - typedef boost::shared_ptr<keep_m_in_n> sptr; + typedef std::shared_ptr<keep_m_in_n> sptr; /*! * Make a keep m in n block. diff --git a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h index 1df562ba07..257fee7d89 100644 --- a/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h +++ b/gr-blocks/include/gnuradio/blocks/keep_one_in_n.h @@ -25,7 +25,7 @@ class BLOCKS_API keep_one_in_n : virtual public block { public: // gr::blocks::keep_one_in_n::sptr - typedef boost::shared_ptr<keep_one_in_n> sptr; + typedef std::shared_ptr<keep_one_in_n> sptr; /*! * Make a keep one in n block. diff --git a/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h index cbb287ef44..f64077f08d 100644 --- a/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h +++ b/gr-blocks/include/gnuradio/blocks/lfsr_32k_source_s.h @@ -30,7 +30,7 @@ class BLOCKS_API lfsr_32k_source_s : virtual public sync_block { public: // gr::blocks::lfsr_32k_source_s::sptr - typedef boost::shared_ptr<lfsr_32k_source_s> sptr; + typedef std::shared_ptr<lfsr_32k_source_s> sptr; /*! * \brief Make a LFSR 32k source block. diff --git a/gr-blocks/include/gnuradio/blocks/magphase_to_complex.h b/gr-blocks/include/gnuradio/blocks/magphase_to_complex.h index c320a574df..6bf75de331 100644 --- a/gr-blocks/include/gnuradio/blocks/magphase_to_complex.h +++ b/gr-blocks/include/gnuradio/blocks/magphase_to_complex.h @@ -25,7 +25,7 @@ class BLOCKS_API magphase_to_complex : virtual public sync_block { public: // gr::blocks::magphase_to_complex_ff::sptr - typedef boost::shared_ptr<magphase_to_complex> sptr; + typedef std::shared_ptr<magphase_to_complex> sptr; /*! * Build a mag and phase to complex block. diff --git a/gr-blocks/include/gnuradio/blocks/max_blk.h b/gr-blocks/include/gnuradio/blocks/max_blk.h index 5fd37a590f..4353308f14 100644 --- a/gr-blocks/include/gnuradio/blocks/max_blk.h +++ b/gr-blocks/include/gnuradio/blocks/max_blk.h @@ -39,7 +39,7 @@ class BLOCKS_API max_blk : virtual public sync_block { public: // gr::blocks::max_blk::sptr - typedef boost::shared_ptr<max_blk<T>> sptr; + typedef std::shared_ptr<max_blk<T>> sptr; static sptr make(size_t vlen, size_t vlen_out = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/message_debug.h b/gr-blocks/include/gnuradio/blocks/message_debug.h index 6b0c2ec187..29d92e306f 100644 --- a/gr-blocks/include/gnuradio/blocks/message_debug.h +++ b/gr-blocks/include/gnuradio/blocks/message_debug.h @@ -40,7 +40,7 @@ class BLOCKS_API message_debug : virtual public block { public: // gr::blocks::message_debug::sptr - typedef boost::shared_ptr<message_debug> sptr; + typedef std::shared_ptr<message_debug> sptr; /*! * \brief Build the message debug block. It takes no parameters diff --git a/gr-blocks/include/gnuradio/blocks/message_strobe.h b/gr-blocks/include/gnuradio/blocks/message_strobe.h index 470aefe53d..01f9e277e4 100644 --- a/gr-blocks/include/gnuradio/blocks/message_strobe.h +++ b/gr-blocks/include/gnuradio/blocks/message_strobe.h @@ -29,7 +29,7 @@ class BLOCKS_API message_strobe : virtual public block { public: // gr::blocks::message_strobe::sptr - typedef boost::shared_ptr<message_strobe> sptr; + typedef std::shared_ptr<message_strobe> sptr; /*! * Make a message stobe block to send message \p msg every \p diff --git a/gr-blocks/include/gnuradio/blocks/message_strobe_random.h b/gr-blocks/include/gnuradio/blocks/message_strobe_random.h index 4267d27753..7f744b89ef 100644 --- a/gr-blocks/include/gnuradio/blocks/message_strobe_random.h +++ b/gr-blocks/include/gnuradio/blocks/message_strobe_random.h @@ -41,7 +41,7 @@ class BLOCKS_API message_strobe_random : virtual public block { public: // gr::blocks::message_strobe_random::sptr - typedef boost::shared_ptr<message_strobe_random> sptr; + typedef std::shared_ptr<message_strobe_random> sptr; /*! * Make a message stobe block to sends message \p msg at random diff --git a/gr-blocks/include/gnuradio/blocks/min_blk.h b/gr-blocks/include/gnuradio/blocks/min_blk.h index 78b4372bde..652a3a35cc 100644 --- a/gr-blocks/include/gnuradio/blocks/min_blk.h +++ b/gr-blocks/include/gnuradio/blocks/min_blk.h @@ -38,7 +38,7 @@ template <class T> class BLOCKS_API min_blk : virtual public sync_block { public: - typedef boost::shared_ptr<min_blk<T>> sptr; + typedef std::shared_ptr<min_blk<T>> sptr; static sptr make(size_t vlen, size_t vlen_out = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/moving_average.h b/gr-blocks/include/gnuradio/blocks/moving_average.h index 097fbf0533..f6af94851a 100644 --- a/gr-blocks/include/gnuradio/blocks/moving_average.h +++ b/gr-blocks/include/gnuradio/blocks/moving_average.h @@ -28,7 +28,7 @@ class BLOCKS_API moving_average : virtual public sync_block { public: // gr::blocks::moving_average::sptr - typedef boost::shared_ptr<moving_average<T>> sptr; + typedef std::shared_ptr<moving_average<T>> sptr; /*! * Create a moving average block. diff --git a/gr-blocks/include/gnuradio/blocks/multiply.h b/gr-blocks/include/gnuradio/blocks/multiply.h index c902a07daf..e95a9b3f36 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply.h +++ b/gr-blocks/include/gnuradio/blocks/multiply.h @@ -31,7 +31,7 @@ class BLOCKS_API multiply : virtual public sync_block { public: // gr::blocks::multiply::sptr - typedef boost::shared_ptr<multiply<T>> sptr; + typedef std::shared_ptr<multiply<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/multiply_by_tag_value_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_by_tag_value_cc.h index d4840582b6..7f3c5670f9 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_by_tag_value_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_by_tag_value_cc.h @@ -33,7 +33,7 @@ class BLOCKS_API multiply_by_tag_value_cc : virtual public sync_block { public: // gr::blocks::multiply_by_tag_value_cc::sptr - typedef boost::shared_ptr<multiply_by_tag_value_cc> sptr; + typedef std::shared_ptr<multiply_by_tag_value_cc> sptr; /*! * \brief Create an instance of multiply_by_tag_value_cc diff --git a/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h index 5f98f07eb3..175d5f2580 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_conjugate_cc.h @@ -25,7 +25,7 @@ class BLOCKS_API multiply_conjugate_cc : virtual public sync_block { public: // gr::blocks::multiply_conjugate_cc::sptr - typedef boost::shared_ptr<multiply_conjugate_cc> sptr; + typedef std::shared_ptr<multiply_conjugate_cc> sptr; /*! * \brief Multiplies a streams by the conjugate of a second stream diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const.h b/gr-blocks/include/gnuradio/blocks/multiply_const.h index df51ffa9a0..3784bcd6eb 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const.h @@ -29,7 +29,7 @@ class BLOCKS_API multiply_const : virtual public sync_block public: // gr::blocks::multiply_const::sptr - typedef boost::shared_ptr<multiply_const<T>> sptr; + typedef std::shared_ptr<multiply_const<T>> sptr; /*! * \brief Create an instance of multiply_const diff --git a/gr-blocks/include/gnuradio/blocks/multiply_const_v.h b/gr-blocks/include/gnuradio/blocks/multiply_const_v.h index a2bb9dec99..73724ab3d9 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_const_v.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_const_v.h @@ -28,7 +28,7 @@ class BLOCKS_API multiply_const_v : virtual public sync_block public: // gr::blocks::multiply_const_v::sptr - typedef boost::shared_ptr<multiply_const_v<T>> sptr; + typedef std::shared_ptr<multiply_const_v<T>> sptr; /*! * \brief Create an instance of multiply_const_v diff --git a/gr-blocks/include/gnuradio/blocks/multiply_matrix.h b/gr-blocks/include/gnuradio/blocks/multiply_matrix.h index 68b9f38d68..574665d998 100644 --- a/gr-blocks/include/gnuradio/blocks/multiply_matrix.h +++ b/gr-blocks/include/gnuradio/blocks/multiply_matrix.h @@ -58,7 +58,7 @@ template <class T> class BLOCKS_API multiply_matrix : virtual public gr::sync_block { public: - typedef boost::shared_ptr<multiply_matrix<T>> sptr; + typedef std::shared_ptr<multiply_matrix<T>> sptr; /*! * \param A The matrix diff --git a/gr-blocks/include/gnuradio/blocks/mute.h b/gr-blocks/include/gnuradio/blocks/mute.h index 64949eb1c6..95518f887b 100644 --- a/gr-blocks/include/gnuradio/blocks/mute.h +++ b/gr-blocks/include/gnuradio/blocks/mute.h @@ -27,7 +27,7 @@ template <class T> class BLOCKS_API mute_blk : virtual public sync_block { public: - typedef boost::shared_ptr<mute_blk<T>> sptr; + typedef std::shared_ptr<mute_blk<T>> sptr; static sptr make(bool mute = false); diff --git a/gr-blocks/include/gnuradio/blocks/nlog10_ff.h b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h index af41c7a193..34b56a057d 100644 --- a/gr-blocks/include/gnuradio/blocks/nlog10_ff.h +++ b/gr-blocks/include/gnuradio/blocks/nlog10_ff.h @@ -25,7 +25,7 @@ class BLOCKS_API nlog10_ff : virtual public sync_block { public: // gr::blocks::nlog10_ff::sptr - typedef boost::shared_ptr<nlog10_ff> sptr; + typedef std::shared_ptr<nlog10_ff> sptr; /*! * \brief Make an instance of an nlog10_ff block. diff --git a/gr-blocks/include/gnuradio/blocks/nop.h b/gr-blocks/include/gnuradio/blocks/nop.h index 1aabd0747c..945d83a366 100644 --- a/gr-blocks/include/gnuradio/blocks/nop.h +++ b/gr-blocks/include/gnuradio/blocks/nop.h @@ -26,7 +26,7 @@ class BLOCKS_API nop : virtual public block { public: // gr::blocks::nop::sptr - typedef boost::shared_ptr<nop> sptr; + typedef std::shared_ptr<nop> sptr; /*! * Build a nop block. diff --git a/gr-blocks/include/gnuradio/blocks/not_blk.h b/gr-blocks/include/gnuradio/blocks/not_blk.h index 77a36a6765..f36c0f2b76 100644 --- a/gr-blocks/include/gnuradio/blocks/not_blk.h +++ b/gr-blocks/include/gnuradio/blocks/not_blk.h @@ -29,7 +29,7 @@ template <class T> class BLOCKS_API not_blk : virtual public sync_block { public: - typedef boost::shared_ptr<not_blk<T>> sptr; + typedef std::shared_ptr<not_blk<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/null_sink.h b/gr-blocks/include/gnuradio/blocks/null_sink.h index a15b499e40..fb51f09490 100644 --- a/gr-blocks/include/gnuradio/blocks/null_sink.h +++ b/gr-blocks/include/gnuradio/blocks/null_sink.h @@ -27,7 +27,7 @@ class BLOCKS_API null_sink : virtual public sync_block { public: // gr::blocks::null_sink::sptr - typedef boost::shared_ptr<null_sink> sptr; + typedef std::shared_ptr<null_sink> sptr; /*! * Build a null sink block. diff --git a/gr-blocks/include/gnuradio/blocks/null_source.h b/gr-blocks/include/gnuradio/blocks/null_source.h index d9bf7139bf..fd837d66e8 100644 --- a/gr-blocks/include/gnuradio/blocks/null_source.h +++ b/gr-blocks/include/gnuradio/blocks/null_source.h @@ -25,7 +25,7 @@ class BLOCKS_API null_source : virtual public sync_block { public: // gr::blocks::null_source::sptr - typedef boost::shared_ptr<null_source> sptr; + typedef std::shared_ptr<null_source> sptr; /*! * Build a null source block. diff --git a/gr-blocks/include/gnuradio/blocks/or_blk.h b/gr-blocks/include/gnuradio/blocks/or_blk.h index 17318fcf31..c263b30e46 100644 --- a/gr-blocks/include/gnuradio/blocks/or_blk.h +++ b/gr-blocks/include/gnuradio/blocks/or_blk.h @@ -28,7 +28,7 @@ class BLOCKS_API or_blk : virtual public sync_block { public: // gr::blocks::or_blk::sptr - typedef boost::shared_ptr<or_blk<T>> sptr; + typedef std::shared_ptr<or_blk<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h index 693e7807b5..4a759b2c0c 100644 --- a/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/pack_k_bits_bb.h @@ -35,7 +35,7 @@ class BLOCKS_API pack_k_bits_bb : virtual public sync_decimator { public: // gr::blocks::pack_k_bits_bb::sptr - typedef boost::shared_ptr<pack_k_bits_bb> sptr; + typedef std::shared_ptr<pack_k_bits_bb> sptr; /*! * \brief Make a pack_k_bits block. diff --git a/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h index e17ed004cf..4d4a40a42e 100644 --- a/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h +++ b/gr-blocks/include/gnuradio/blocks/packed_to_unpacked.h @@ -51,7 +51,7 @@ class BLOCKS_API packed_to_unpacked : virtual public block { public: // gr::blocks::packed_to_unpacked::sptr - typedef boost::shared_ptr<packed_to_unpacked<T>> sptr; + typedef std::shared_ptr<packed_to_unpacked<T>> sptr; static sptr make(unsigned int bits_per_chunk, endianness_t endianness); }; diff --git a/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h index 7538085ad0..ea61cca766 100644 --- a/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h +++ b/gr-blocks/include/gnuradio/blocks/patterned_interleaver.h @@ -24,7 +24,7 @@ namespace blocks { class BLOCKS_API patterned_interleaver : virtual public block { public: - typedef boost::shared_ptr<patterned_interleaver> sptr; + typedef std::shared_ptr<patterned_interleaver> sptr; /*! * Make a patterned interleaver block. diff --git a/gr-blocks/include/gnuradio/blocks/pdu_filter.h b/gr-blocks/include/gnuradio/blocks/pdu_filter.h index 322e3eabed..db43fc914e 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_filter.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_filter.h @@ -26,7 +26,7 @@ class BLOCKS_API pdu_filter : virtual public block { public: // gr::blocks::pdu_filter::sptr - typedef boost::shared_ptr<pdu_filter> sptr; + typedef std::shared_ptr<pdu_filter> sptr; /*! * \brief Construct a PDU filter diff --git a/gr-blocks/include/gnuradio/blocks/pdu_remove.h b/gr-blocks/include/gnuradio/blocks/pdu_remove.h index 440c7c8467..266d917486 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_remove.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_remove.h @@ -26,7 +26,7 @@ class BLOCKS_API pdu_remove : virtual public block { public: // gr::blocks::pdu_remove::sptr - typedef boost::shared_ptr<pdu_remove> sptr; + typedef std::shared_ptr<pdu_remove> sptr; /*! * \brief Construct a PDU meta remove block diff --git a/gr-blocks/include/gnuradio/blocks/pdu_set.h b/gr-blocks/include/gnuradio/blocks/pdu_set.h index d0be124199..fad755a9dc 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_set.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_set.h @@ -26,7 +26,7 @@ class BLOCKS_API pdu_set : virtual public block { public: // gr::blocks::pdu_set::sptr - typedef boost::shared_ptr<pdu_set> sptr; + typedef std::shared_ptr<pdu_set> sptr; /*! * \brief Construct a PDU meta set block diff --git a/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h index dd1b2d16c9..ec364a4248 100644 --- a/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h +++ b/gr-blocks/include/gnuradio/blocks/pdu_to_tagged_stream.h @@ -26,7 +26,7 @@ class BLOCKS_API pdu_to_tagged_stream : virtual public tagged_stream_block { public: // gr::blocks::pdu_to_tagged_stream::sptr - typedef boost::shared_ptr<pdu_to_tagged_stream> sptr; + typedef std::shared_ptr<pdu_to_tagged_stream> sptr; /*! * \brief Construct a pdu_to_tagged_stream block diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector.h b/gr-blocks/include/gnuradio/blocks/peak_detector.h index b7849d6ee6..666a8df574 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector.h +++ b/gr-blocks/include/gnuradio/blocks/peak_detector.h @@ -30,7 +30,7 @@ template <class T> class BLOCKS_API peak_detector : virtual public sync_block { public: - typedef boost::shared_ptr<peak_detector<T>> sptr; + typedef std::shared_ptr<peak_detector<T>> sptr; /*! * Make a peak detector block. diff --git a/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h index dd3d95a3ae..e01a7726bf 100644 --- a/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h +++ b/gr-blocks/include/gnuradio/blocks/peak_detector2_fb.h @@ -30,7 +30,7 @@ class BLOCKS_API peak_detector2_fb : virtual public sync_block { public: // gr::blocks::peak_detector2_fb::sptr - typedef boost::shared_ptr<peak_detector2_fb> sptr; + typedef std::shared_ptr<peak_detector2_fb> sptr; /*! * Build a peak detector block with float in, byte out. diff --git a/gr-blocks/include/gnuradio/blocks/phase_shift.h b/gr-blocks/include/gnuradio/blocks/phase_shift.h index e74145c5be..1e97f9c716 100644 --- a/gr-blocks/include/gnuradio/blocks/phase_shift.h +++ b/gr-blocks/include/gnuradio/blocks/phase_shift.h @@ -30,7 +30,7 @@ namespace blocks { class BLOCKS_API phase_shift : virtual public gr::sync_block { public: - typedef boost::shared_ptr<phase_shift> sptr; + typedef std::shared_ptr<phase_shift> sptr; /*! * \brief Create an instance of phase_shift diff --git a/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h index ff40d88c1f..1ff2c1ce45 100644 --- a/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h +++ b/gr-blocks/include/gnuradio/blocks/plateau_detector_fb.h @@ -42,7 +42,7 @@ namespace blocks { class BLOCKS_API plateau_detector_fb : virtual public block { public: - typedef boost::shared_ptr<plateau_detector_fb> sptr; + typedef std::shared_ptr<plateau_detector_fb> sptr; /*! * \param max_len Maximum length of the plateau diff --git a/gr-blocks/include/gnuradio/blocks/probe_rate.h b/gr-blocks/include/gnuradio/blocks/probe_rate.h index e533713a8f..243474e2d7 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_rate.h +++ b/gr-blocks/include/gnuradio/blocks/probe_rate.h @@ -25,7 +25,7 @@ class BLOCKS_API probe_rate : virtual public sync_block { public: // gr::blocks::probe_rate::sptr - typedef boost::shared_ptr<probe_rate> sptr; + typedef std::shared_ptr<probe_rate> sptr; /*! * \brief Make a throughput measurement block diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal.h b/gr-blocks/include/gnuradio/blocks/probe_signal.h index 85bcbc9fb1..4034944dbc 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_signal.h +++ b/gr-blocks/include/gnuradio/blocks/probe_signal.h @@ -28,7 +28,7 @@ class BLOCKS_API probe_signal : virtual public sync_block { public: // gr::blocks::probe_signal::sptr - typedef boost::shared_ptr<probe_signal<T>> sptr; + typedef std::shared_ptr<probe_signal<T>> sptr; static sptr make(); diff --git a/gr-blocks/include/gnuradio/blocks/probe_signal_v.h b/gr-blocks/include/gnuradio/blocks/probe_signal_v.h index a9371b84ba..4c52c74103 100644 --- a/gr-blocks/include/gnuradio/blocks/probe_signal_v.h +++ b/gr-blocks/include/gnuradio/blocks/probe_signal_v.h @@ -28,7 +28,7 @@ template <class T> class BLOCKS_API probe_signal_v : virtual public sync_block { public: - typedef boost::shared_ptr<probe_signal_v<T>> sptr; + typedef std::shared_ptr<probe_signal_v<T>> sptr; static sptr make(size_t size); diff --git a/gr-blocks/include/gnuradio/blocks/random_pdu.h b/gr-blocks/include/gnuradio/blocks/random_pdu.h index d41de54042..7c57d1de6c 100644 --- a/gr-blocks/include/gnuradio/blocks/random_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/random_pdu.h @@ -26,7 +26,7 @@ class BLOCKS_API random_pdu : virtual public block { public: // gr::blocks::random_pdu::sptr - typedef boost::shared_ptr<random_pdu> sptr; + typedef std::shared_ptr<random_pdu> sptr; /*! * \brief Construct a random PDU generator diff --git a/gr-blocks/include/gnuradio/blocks/regenerate_bb.h b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h index 396318c84b..5701256f0d 100644 --- a/gr-blocks/include/gnuradio/blocks/regenerate_bb.h +++ b/gr-blocks/include/gnuradio/blocks/regenerate_bb.h @@ -33,7 +33,7 @@ class BLOCKS_API regenerate_bb : virtual public sync_block { public: // gr::blocks::regenerate_bb::sptr - typedef boost::shared_ptr<regenerate_bb> sptr; + typedef std::shared_ptr<regenerate_bb> sptr; /*! * \brief Make a regenerate block diff --git a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h index 69a28dba47..1031582c88 100644 --- a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h @@ -56,7 +56,7 @@ namespace blocks { class BLOCKS_API repack_bits_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<repack_bits_bb> sptr; + typedef std::shared_ptr<repack_bits_bb> sptr; /*! * \param k Number of relevant bits on the input stream diff --git a/gr-blocks/include/gnuradio/blocks/repeat.h b/gr-blocks/include/gnuradio/blocks/repeat.h index fa234b895b..5a839d30cd 100644 --- a/gr-blocks/include/gnuradio/blocks/repeat.h +++ b/gr-blocks/include/gnuradio/blocks/repeat.h @@ -30,7 +30,7 @@ class BLOCKS_API repeat : virtual public sync_interpolator { public: // gr::blocks::repeat::sptr - typedef boost::shared_ptr<repeat> sptr; + typedef std::shared_ptr<repeat> sptr; /*! * Make a repeat block. diff --git a/gr-blocks/include/gnuradio/blocks/rms_cf.h b/gr-blocks/include/gnuradio/blocks/rms_cf.h index 0d0c0ee0a8..8567f4bb84 100644 --- a/gr-blocks/include/gnuradio/blocks/rms_cf.h +++ b/gr-blocks/include/gnuradio/blocks/rms_cf.h @@ -25,7 +25,7 @@ class BLOCKS_API rms_cf : virtual public sync_block { public: // gr::blocks::rms_cf::sptr - typedef boost::shared_ptr<rms_cf> sptr; + typedef std::shared_ptr<rms_cf> sptr; /*! * \brief Make an RMS calc. block. diff --git a/gr-blocks/include/gnuradio/blocks/rms_ff.h b/gr-blocks/include/gnuradio/blocks/rms_ff.h index f020d0bd3d..7e6629b210 100644 --- a/gr-blocks/include/gnuradio/blocks/rms_ff.h +++ b/gr-blocks/include/gnuradio/blocks/rms_ff.h @@ -25,7 +25,7 @@ class BLOCKS_API rms_ff : virtual public sync_block { public: // gr::blocks::rms_ff::sptr - typedef boost::shared_ptr<rms_ff> sptr; + typedef std::shared_ptr<rms_ff> sptr; /*! * \brief Make an RMS calc. block. diff --git a/gr-blocks/include/gnuradio/blocks/rotator_cc.h b/gr-blocks/include/gnuradio/blocks/rotator_cc.h index 018c092b56..9979ddd98a 100644 --- a/gr-blocks/include/gnuradio/blocks/rotator_cc.h +++ b/gr-blocks/include/gnuradio/blocks/rotator_cc.h @@ -25,7 +25,7 @@ class BLOCKS_API rotator_cc : virtual public sync_block { public: // gr::blocks::rotator_cc::sptr - typedef boost::shared_ptr<rotator_cc> sptr; + typedef std::shared_ptr<rotator_cc> sptr; /*! * \brief Make an complex rotator block diff --git a/gr-blocks/include/gnuradio/blocks/sample_and_hold.h b/gr-blocks/include/gnuradio/blocks/sample_and_hold.h index 3579c043fe..d04c9782c3 100644 --- a/gr-blocks/include/gnuradio/blocks/sample_and_hold.h +++ b/gr-blocks/include/gnuradio/blocks/sample_and_hold.h @@ -32,7 +32,7 @@ class BLOCKS_API sample_and_hold : virtual public sync_block { public: // gr::blocks::sample_and_hold::sptr - typedef boost::shared_ptr<sample_and_hold<T>> sptr; + typedef std::shared_ptr<sample_and_hold<T>> sptr; static sptr make(); }; diff --git a/gr-blocks/include/gnuradio/blocks/selector.h b/gr-blocks/include/gnuradio/blocks/selector.h index f4e93af770..560c8f5c17 100644 --- a/gr-blocks/include/gnuradio/blocks/selector.h +++ b/gr-blocks/include/gnuradio/blocks/selector.h @@ -30,7 +30,7 @@ namespace blocks { class BLOCKS_API selector : virtual public block { public: - typedef boost::shared_ptr<selector> sptr; + typedef std::shared_ptr<selector> sptr; static sptr make(size_t itemsize, unsigned int input_index, unsigned int output_index); diff --git a/gr-blocks/include/gnuradio/blocks/short_to_char.h b/gr-blocks/include/gnuradio/blocks/short_to_char.h index 68ba920992..ca6d0e24bd 100644 --- a/gr-blocks/include/gnuradio/blocks/short_to_char.h +++ b/gr-blocks/include/gnuradio/blocks/short_to_char.h @@ -35,7 +35,7 @@ class BLOCKS_API short_to_char : virtual public sync_block { public: // gr::blocks::short_to_char_ff::sptr - typedef boost::shared_ptr<short_to_char> sptr; + typedef std::shared_ptr<short_to_char> sptr; /*! * Build a short to char block. diff --git a/gr-blocks/include/gnuradio/blocks/short_to_float.h b/gr-blocks/include/gnuradio/blocks/short_to_float.h index 4655a19d05..dd850a991f 100644 --- a/gr-blocks/include/gnuradio/blocks/short_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/short_to_float.h @@ -25,7 +25,7 @@ class BLOCKS_API short_to_float : virtual public sync_block { public: // gr::blocks::short_to_float_ff::sptr - typedef boost::shared_ptr<short_to_float> sptr; + typedef std::shared_ptr<short_to_float> sptr; /*! * Build a short to float block. diff --git a/gr-blocks/include/gnuradio/blocks/skiphead.h b/gr-blocks/include/gnuradio/blocks/skiphead.h index 9d46985422..0be1ec7f38 100644 --- a/gr-blocks/include/gnuradio/blocks/skiphead.h +++ b/gr-blocks/include/gnuradio/blocks/skiphead.h @@ -30,7 +30,7 @@ class BLOCKS_API skiphead : virtual public block { public: // gr::blocks::skiphead::sptr - typedef boost::shared_ptr<skiphead> sptr; + typedef std::shared_ptr<skiphead> sptr; static sptr make(size_t itemsize, uint64_t nitems_to_skip); }; diff --git a/gr-blocks/include/gnuradio/blocks/socket_pdu.h b/gr-blocks/include/gnuradio/blocks/socket_pdu.h index 00b1b9a798..50841a5237 100644 --- a/gr-blocks/include/gnuradio/blocks/socket_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/socket_pdu.h @@ -25,7 +25,7 @@ class BLOCKS_API socket_pdu : virtual public block { public: // gr::blocks::socket_pdu::sptr - typedef boost::shared_ptr<socket_pdu> sptr; + typedef std::shared_ptr<socket_pdu> sptr; /*! * \brief Construct a SOCKET PDU interface diff --git a/gr-blocks/include/gnuradio/blocks/stream_mux.h b/gr-blocks/include/gnuradio/blocks/stream_mux.h index c44d0118e7..be6255ba7f 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/stream_mux.h @@ -34,7 +34,7 @@ class BLOCKS_API stream_mux : virtual public block { public: // gr::blocks::stream_mux::sptr - typedef boost::shared_ptr<stream_mux> sptr; + typedef std::shared_ptr<stream_mux> sptr; /*! * \brief Creates a stream muxing block to multiplex many streams into diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_streams.h b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h index 47369911d7..d08be72908 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_to_streams.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_streams.h @@ -29,7 +29,7 @@ class BLOCKS_API stream_to_streams : virtual public sync_decimator { public: // gr::blocks::stream_to_streams::sptr - typedef boost::shared_ptr<stream_to_streams> sptr; + typedef std::shared_ptr<stream_to_streams> sptr; /*! * Make a stream-to-streams block. diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h b/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h index 08b4afb0d0..2ebd6ddad3 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_tagged_stream.h @@ -33,7 +33,7 @@ namespace blocks { class BLOCKS_API stream_to_tagged_stream : virtual public gr::sync_block { public: - typedef boost::shared_ptr<stream_to_tagged_stream> sptr; + typedef std::shared_ptr<stream_to_tagged_stream> sptr; /*! * \param itemsize Item size diff --git a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h index 6a6ed6082c..7c456eb4bd 100644 --- a/gr-blocks/include/gnuradio/blocks/stream_to_vector.h +++ b/gr-blocks/include/gnuradio/blocks/stream_to_vector.h @@ -25,7 +25,7 @@ class BLOCKS_API stream_to_vector : virtual public sync_decimator { public: // gr::blocks::stream_to_vector::sptr - typedef boost::shared_ptr<stream_to_vector> sptr; + typedef std::shared_ptr<stream_to_vector> sptr; /*! * Make a stream-to-vector block. diff --git a/gr-blocks/include/gnuradio/blocks/streams_to_stream.h b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h index 0f1dc542aa..5c1f0ac7fc 100644 --- a/gr-blocks/include/gnuradio/blocks/streams_to_stream.h +++ b/gr-blocks/include/gnuradio/blocks/streams_to_stream.h @@ -29,7 +29,7 @@ class BLOCKS_API streams_to_stream : virtual public sync_interpolator { public: // gr::blocks::streams_to_stream::sptr - typedef boost::shared_ptr<streams_to_stream> sptr; + typedef std::shared_ptr<streams_to_stream> sptr; /*! * Make a streams-to-stream block. diff --git a/gr-blocks/include/gnuradio/blocks/streams_to_vector.h b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h index 6df51a9680..1126add6ae 100644 --- a/gr-blocks/include/gnuradio/blocks/streams_to_vector.h +++ b/gr-blocks/include/gnuradio/blocks/streams_to_vector.h @@ -25,7 +25,7 @@ class BLOCKS_API streams_to_vector : virtual public sync_block { public: // gr::blocks::streams_to_vector::sptr - typedef boost::shared_ptr<streams_to_vector> sptr; + typedef std::shared_ptr<streams_to_vector> sptr; /*! * Make a stream-to-vector block. diff --git a/gr-blocks/include/gnuradio/blocks/stretch_ff.h b/gr-blocks/include/gnuradio/blocks/stretch_ff.h index 0513e42354..6568688b4f 100644 --- a/gr-blocks/include/gnuradio/blocks/stretch_ff.h +++ b/gr-blocks/include/gnuradio/blocks/stretch_ff.h @@ -27,7 +27,7 @@ class BLOCKS_API stretch_ff : virtual public sync_block { public: // gr::blocks::stretch_ff::sptr - typedef boost::shared_ptr<stretch_ff> sptr; + typedef std::shared_ptr<stretch_ff> sptr; /*! * \brief Make a stretch block. diff --git a/gr-blocks/include/gnuradio/blocks/sub.h b/gr-blocks/include/gnuradio/blocks/sub.h index e982d2da31..9a8e0f7e8b 100644 --- a/gr-blocks/include/gnuradio/blocks/sub.h +++ b/gr-blocks/include/gnuradio/blocks/sub.h @@ -31,7 +31,7 @@ class BLOCKS_API sub : virtual public sync_block { public: // gr::blocks::sub::sptr - typedef boost::shared_ptr<sub<T>> sptr; + typedef std::shared_ptr<sub<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/include/gnuradio/blocks/tag_debug.h b/gr-blocks/include/gnuradio/blocks/tag_debug.h index 008e78f71a..c39ff77a67 100644 --- a/gr-blocks/include/gnuradio/blocks/tag_debug.h +++ b/gr-blocks/include/gnuradio/blocks/tag_debug.h @@ -47,7 +47,7 @@ class BLOCKS_API tag_debug : virtual public sync_block { public: // gr::blocks::tag_debug::sptr - typedef boost::shared_ptr<tag_debug> sptr; + typedef std::shared_ptr<tag_debug> sptr; /*! * Build a tag debug block diff --git a/gr-blocks/include/gnuradio/blocks/tag_gate.h b/gr-blocks/include/gnuradio/blocks/tag_gate.h index 957cfc4b3c..c34c2381bf 100644 --- a/gr-blocks/include/gnuradio/blocks/tag_gate.h +++ b/gr-blocks/include/gnuradio/blocks/tag_gate.h @@ -26,7 +26,7 @@ namespace blocks { class BLOCKS_API tag_gate : virtual public gr::sync_block { public: - typedef boost::shared_ptr<tag_gate> sptr; + typedef std::shared_ptr<tag_gate> sptr; virtual void set_propagation(bool propagate_tags) = 0; diff --git a/gr-blocks/include/gnuradio/blocks/tag_share.h b/gr-blocks/include/gnuradio/blocks/tag_share.h index dcba16bbe7..dbc0420bbc 100644 --- a/gr-blocks/include/gnuradio/blocks/tag_share.h +++ b/gr-blocks/include/gnuradio/blocks/tag_share.h @@ -35,7 +35,7 @@ namespace blocks { class BLOCKS_API tag_share : virtual public gr::sync_block { public: - typedef boost::shared_ptr<tag_share> sptr; + typedef std::shared_ptr<tag_share> sptr; /*! * \param sizeof_io_item The size of the Input 0/Output 0 stream type. Input 0 diff --git a/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h index 4410056fa9..a28d97b96e 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_file_sink.h @@ -37,7 +37,7 @@ class BLOCKS_API tagged_file_sink : virtual public sync_block { public: // gr::blocks::tagged_file_sink::sptr - typedef boost::shared_ptr<tagged_file_sink> sptr; + typedef std::shared_ptr<tagged_file_sink> sptr; /*! * \brief Build a tagged_file_sink block. diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h index a7dbd698e2..f814e24714 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_align.h @@ -26,7 +26,7 @@ namespace blocks { class BLOCKS_API tagged_stream_align : virtual public block { public: - typedef boost::shared_ptr<tagged_stream_align> sptr; + typedef std::shared_ptr<tagged_stream_align> sptr; /*! * Make a tagged stream align diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h index 3e745d4224..f7b99cae0e 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_multiply_length.h @@ -28,7 +28,7 @@ namespace blocks { class BLOCKS_API tagged_stream_multiply_length : virtual public block { public: - typedef boost::shared_ptr<tagged_stream_multiply_length> sptr; + typedef std::shared_ptr<tagged_stream_multiply_length> sptr; virtual void set_scalar(double scalar) = 0; /*! diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h index 11cf40c6cd..2dcbee4f57 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_mux.h @@ -38,7 +38,7 @@ namespace blocks { class BLOCKS_API tagged_stream_mux : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<tagged_stream_mux> sptr; + typedef std::shared_ptr<tagged_stream_mux> sptr; /*! * Make a tagged stream mux block. diff --git a/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h index 631d0ca236..74c7b74773 100644 --- a/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/tagged_stream_to_pdu.h @@ -31,7 +31,7 @@ class BLOCKS_API tagged_stream_to_pdu : virtual public tagged_stream_block { public: // gr::blocks::tagged_stream_to_pdu::sptr - typedef boost::shared_ptr<tagged_stream_to_pdu> sptr; + typedef std::shared_ptr<tagged_stream_to_pdu> sptr; /*! * \brief Construct a tagged_stream_to_pdu block diff --git a/gr-blocks/include/gnuradio/blocks/tags_strobe.h b/gr-blocks/include/gnuradio/blocks/tags_strobe.h index ae7b37bbd6..443da6d018 100644 --- a/gr-blocks/include/gnuradio/blocks/tags_strobe.h +++ b/gr-blocks/include/gnuradio/blocks/tags_strobe.h @@ -33,7 +33,7 @@ class BLOCKS_API tags_strobe : virtual public sync_block { public: // gr::blocks::tags_strobe::sptr - typedef boost::shared_ptr<tags_strobe> sptr; + typedef std::shared_ptr<tags_strobe> sptr; /*! * Make a tags stobe block to send tags with value \p value diff --git a/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h b/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h index 7938b80054..82c9becb14 100644 --- a/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tcp_server_sink.h @@ -30,7 +30,7 @@ class BLOCKS_API tcp_server_sink : virtual public gr::sync_block { public: // gr::blocks::tcp_server_sink::sptr - typedef boost::shared_ptr<tcp_server_sink> sptr; + typedef std::shared_ptr<tcp_server_sink> sptr; /*! * \brief TCP Server Sink Constructor diff --git a/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h b/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h index 30d3678fb4..3f36c5ae6d 100644 --- a/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h +++ b/gr-blocks/include/gnuradio/blocks/test_tag_variable_rate_ff.h @@ -47,7 +47,7 @@ class BLOCKS_API test_tag_variable_rate_ff : virtual public block { public: // gr::blocks::test_tag_variable_rate_ff::sptr - typedef boost::shared_ptr<test_tag_variable_rate_ff> sptr; + typedef std::shared_ptr<test_tag_variable_rate_ff> sptr; /*! * Build a test_tag_variable_rate_ff block. diff --git a/gr-blocks/include/gnuradio/blocks/threshold_ff.h b/gr-blocks/include/gnuradio/blocks/threshold_ff.h index a3900be0f4..c66b85c74a 100644 --- a/gr-blocks/include/gnuradio/blocks/threshold_ff.h +++ b/gr-blocks/include/gnuradio/blocks/threshold_ff.h @@ -30,7 +30,7 @@ class BLOCKS_API threshold_ff : virtual public sync_block { public: // gr::blocks::threshold_ff::sptr - typedef boost::shared_ptr<threshold_ff> sptr; + typedef std::shared_ptr<threshold_ff> sptr; /* \brief Create a threadshold block. * \param lo Threshold input signal needs to drop below to diff --git a/gr-blocks/include/gnuradio/blocks/throttle.h b/gr-blocks/include/gnuradio/blocks/throttle.h index 6d3f8bb0ae..9372a8711b 100644 --- a/gr-blocks/include/gnuradio/blocks/throttle.h +++ b/gr-blocks/include/gnuradio/blocks/throttle.h @@ -34,7 +34,7 @@ namespace blocks { class BLOCKS_API throttle : virtual public sync_block { public: - typedef boost::shared_ptr<throttle> sptr; + typedef std::shared_ptr<throttle> sptr; static sptr make(size_t itemsize, double samples_per_sec, bool ignore_tags = true); diff --git a/gr-blocks/include/gnuradio/blocks/transcendental.h b/gr-blocks/include/gnuradio/blocks/transcendental.h index 30b16880ac..421aa3d7a8 100644 --- a/gr-blocks/include/gnuradio/blocks/transcendental.h +++ b/gr-blocks/include/gnuradio/blocks/transcendental.h @@ -34,7 +34,7 @@ class BLOCKS_API transcendental : virtual public sync_block { public: // gr::blocks::transcendental::sptr - typedef boost::shared_ptr<transcendental> sptr; + typedef std::shared_ptr<transcendental> sptr; static sptr make(const std::string& name, const std::string& type = "float"); }; diff --git a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h index 6a349f6ff6..67b417c058 100644 --- a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h +++ b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink.h @@ -30,7 +30,7 @@ template <class T> class BLOCKS_API tsb_vector_sink : virtual public gr::tagged_stream_block { public: - typedef boost::shared_ptr<tsb_vector_sink<T>> sptr; + typedef std::shared_ptr<tsb_vector_sink<T>> sptr; virtual void reset() = 0; virtual std::vector<std::vector<T>> data() const = 0; diff --git a/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h index 93a00adc55..90424d928d 100644 --- a/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h +++ b/gr-blocks/include/gnuradio/blocks/tuntap_pdu.h @@ -25,7 +25,7 @@ class BLOCKS_API tuntap_pdu : virtual public block { public: // gr::blocks::tuntap_pdu::sptr - typedef boost::shared_ptr<tuntap_pdu> sptr; + typedef std::shared_ptr<tuntap_pdu> sptr; /*! * \brief Construct a TUNTAP PDU interface diff --git a/gr-blocks/include/gnuradio/blocks/uchar_to_float.h b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h index 8b7702bd23..62b016ec85 100644 --- a/gr-blocks/include/gnuradio/blocks/uchar_to_float.h +++ b/gr-blocks/include/gnuradio/blocks/uchar_to_float.h @@ -25,7 +25,7 @@ class BLOCKS_API uchar_to_float : virtual public sync_block { public: // gr::blocks::uchar_to_float_ff::sptr - typedef boost::shared_ptr<uchar_to_float> sptr; + typedef std::shared_ptr<uchar_to_float> sptr; /*! * Build a uchar to float block. diff --git a/gr-blocks/include/gnuradio/blocks/udp_sink.h b/gr-blocks/include/gnuradio/blocks/udp_sink.h index 3ea6a77671..950aec1306 100644 --- a/gr-blocks/include/gnuradio/blocks/udp_sink.h +++ b/gr-blocks/include/gnuradio/blocks/udp_sink.h @@ -25,7 +25,7 @@ class BLOCKS_API udp_sink : virtual public sync_block { public: // gr::blocks::udp_sink::sptr - typedef boost::shared_ptr<udp_sink> sptr; + typedef std::shared_ptr<udp_sink> sptr; /*! * \brief UDP Sink Constructor diff --git a/gr-blocks/include/gnuradio/blocks/udp_source.h b/gr-blocks/include/gnuradio/blocks/udp_source.h index 3b3957a97c..8e5d037544 100644 --- a/gr-blocks/include/gnuradio/blocks/udp_source.h +++ b/gr-blocks/include/gnuradio/blocks/udp_source.h @@ -25,7 +25,7 @@ class BLOCKS_API udp_source : virtual public sync_block { public: // gr::blocks::udp_source::sptr - typedef boost::shared_ptr<udp_source> sptr; + typedef std::shared_ptr<udp_source> sptr; /*! * \brief UDP Source Constructor diff --git a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h index 7e2766584a..9e70cc74cf 100644 --- a/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/unpack_k_bits_bb.h @@ -33,7 +33,7 @@ class BLOCKS_API unpack_k_bits_bb : virtual public sync_interpolator { public: // gr::blocks::unpack_k_bits_bb::sptr - typedef boost::shared_ptr<unpack_k_bits_bb> sptr; + typedef std::shared_ptr<unpack_k_bits_bb> sptr; /*! * \brief Make an unpack_k_bits block. diff --git a/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h index a6fad35d9f..08c5cd5061 100644 --- a/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h +++ b/gr-blocks/include/gnuradio/blocks/unpacked_to_packed.h @@ -50,7 +50,7 @@ class BLOCKS_API unpacked_to_packed : virtual public block { public: // gr::blocks::unpacked_to_packed::sptr - typedef boost::shared_ptr<unpacked_to_packed<T>> sptr; + typedef std::shared_ptr<unpacked_to_packed<T>> sptr; static sptr make(unsigned int bits_per_chunk, endianness_t endianness); }; diff --git a/gr-blocks/include/gnuradio/blocks/vco_c.h b/gr-blocks/include/gnuradio/blocks/vco_c.h index 7abc44e8b1..de24dd3def 100644 --- a/gr-blocks/include/gnuradio/blocks/vco_c.h +++ b/gr-blocks/include/gnuradio/blocks/vco_c.h @@ -29,7 +29,7 @@ class BLOCKS_API vco_c : virtual public sync_block { public: // gr::blocks::vco_c::sptr - typedef boost::shared_ptr<vco_c> sptr; + typedef std::shared_ptr<vco_c> sptr; /*! * \brief VCO - Voltage controlled oscillator diff --git a/gr-blocks/include/gnuradio/blocks/vco_f.h b/gr-blocks/include/gnuradio/blocks/vco_f.h index 935e32c50a..ec0112f0cc 100644 --- a/gr-blocks/include/gnuradio/blocks/vco_f.h +++ b/gr-blocks/include/gnuradio/blocks/vco_f.h @@ -29,7 +29,7 @@ class BLOCKS_API vco_f : virtual public sync_block { public: // gr::blocks::vco_f::sptr - typedef boost::shared_ptr<vco_f> sptr; + typedef std::shared_ptr<vco_f> sptr; /*! * \brief VCO - Voltage controlled oscillator diff --git a/gr-blocks/include/gnuradio/blocks/vector_insert.h b/gr-blocks/include/gnuradio/blocks/vector_insert.h index 1807632db2..b2c06a393d 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_insert.h +++ b/gr-blocks/include/gnuradio/blocks/vector_insert.h @@ -28,7 +28,7 @@ class BLOCKS_API vector_insert : virtual public block { public: // gr::blocks::vector_insert::sptr - typedef boost::shared_ptr<vector_insert<T>> sptr; + typedef std::shared_ptr<vector_insert<T>> sptr; /*! * Make vector insert block. diff --git a/gr-blocks/include/gnuradio/blocks/vector_map.h b/gr-blocks/include/gnuradio/blocks/vector_map.h index 36e562e961..81d0d7be0a 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_map.h +++ b/gr-blocks/include/gnuradio/blocks/vector_map.h @@ -37,7 +37,7 @@ class BLOCKS_API vector_map : virtual public sync_block { public: // gr::blocks::vector_map::sptr - typedef boost::shared_ptr<vector_map> sptr; + typedef std::shared_ptr<vector_map> sptr; /*! * Build a vector map block. diff --git a/gr-blocks/include/gnuradio/blocks/vector_sink.h b/gr-blocks/include/gnuradio/blocks/vector_sink.h index 123b695905..9d993a0b06 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_sink.h +++ b/gr-blocks/include/gnuradio/blocks/vector_sink.h @@ -28,7 +28,7 @@ class BLOCKS_API vector_sink : virtual public sync_block { public: // gr::blocks::vector_sink::sptr - typedef boost::shared_ptr<vector_sink<T>> sptr; + typedef std::shared_ptr<vector_sink<T>> sptr; /*! * \brief Make a new instance of the vector source, and return a shared pointer to it. diff --git a/gr-blocks/include/gnuradio/blocks/vector_source.h b/gr-blocks/include/gnuradio/blocks/vector_source.h index 13bdb922ab..cecd0123fa 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_source.h +++ b/gr-blocks/include/gnuradio/blocks/vector_source.h @@ -56,7 +56,7 @@ class BLOCKS_API vector_source : virtual public sync_block { public: // gr::blocks::vector_source::sptr - typedef boost::shared_ptr<vector_source<T>> sptr; + typedef std::shared_ptr<vector_source<T>> sptr; static sptr make(const std::vector<T>& data, bool repeat = false, diff --git a/gr-blocks/include/gnuradio/blocks/vector_to_stream.h b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h index 7feb7560bb..d9a1030dc4 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_to_stream.h +++ b/gr-blocks/include/gnuradio/blocks/vector_to_stream.h @@ -25,7 +25,7 @@ class BLOCKS_API vector_to_stream : virtual public sync_interpolator { public: // gr::blocks::vector_to_stream::sptr - typedef boost::shared_ptr<vector_to_stream> sptr; + typedef std::shared_ptr<vector_to_stream> sptr; /*! * Make vector-to-stream block diff --git a/gr-blocks/include/gnuradio/blocks/vector_to_streams.h b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h index 1a7356c59c..18f5db7fc8 100644 --- a/gr-blocks/include/gnuradio/blocks/vector_to_streams.h +++ b/gr-blocks/include/gnuradio/blocks/vector_to_streams.h @@ -25,7 +25,7 @@ class BLOCKS_API vector_to_streams : virtual public sync_block { public: // gr::blocks::vector_to_streams::sptr - typedef boost::shared_ptr<vector_to_streams> sptr; + typedef std::shared_ptr<vector_to_streams> sptr; /*! * Make vector-to-streams block diff --git a/gr-blocks/include/gnuradio/blocks/wavfile_sink.h b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h index 10b1276e85..d996339300 100644 --- a/gr-blocks/include/gnuradio/blocks/wavfile_sink.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile_sink.h @@ -29,7 +29,7 @@ class BLOCKS_API wavfile_sink : virtual public sync_block { public: // gr::blocks::wavfile_sink::sptr - typedef boost::shared_ptr<wavfile_sink> sptr; + typedef std::shared_ptr<wavfile_sink> sptr; /* * \param filename The .wav file to be opened diff --git a/gr-blocks/include/gnuradio/blocks/wavfile_source.h b/gr-blocks/include/gnuradio/blocks/wavfile_source.h index c82b9981ec..d20838534f 100644 --- a/gr-blocks/include/gnuradio/blocks/wavfile_source.h +++ b/gr-blocks/include/gnuradio/blocks/wavfile_source.h @@ -29,7 +29,7 @@ class BLOCKS_API wavfile_source : virtual public sync_block { public: // gr::blocks::wavfile_source::sptr - typedef boost::shared_ptr<wavfile_source> sptr; + typedef std::shared_ptr<wavfile_source> sptr; static sptr make(const char* filename, bool repeat = false); diff --git a/gr-blocks/include/gnuradio/blocks/xor_blk.h b/gr-blocks/include/gnuradio/blocks/xor_blk.h index e6b629a2ad..59f3d3f1fc 100644 --- a/gr-blocks/include/gnuradio/blocks/xor_blk.h +++ b/gr-blocks/include/gnuradio/blocks/xor_blk.h @@ -30,7 +30,7 @@ class BLOCKS_API xor_blk : virtual public sync_block { public: // gr::blocks::xor::sptr - typedef boost::shared_ptr<xor_blk<T>> sptr; + typedef std::shared_ptr<xor_blk<T>> sptr; static sptr make(size_t vlen = 1); }; diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc index e17e5c39c9..9a601c6cb7 100644 --- a/gr-blocks/lib/message_strobe_impl.cc +++ b/gr-blocks/lib/message_strobe_impl.cc @@ -52,7 +52,7 @@ bool message_strobe_impl::start() // NOTE: d_finished should be something explicitly thread safe. But since // nothing breaks on concurrent access, I'll just leave it as bool. d_finished = false; - d_thread = boost::shared_ptr<gr::thread::thread>( + d_thread = std::shared_ptr<gr::thread::thread>( new gr::thread::thread(boost::bind(&message_strobe_impl::run, this))); return block::start(); diff --git a/gr-blocks/lib/message_strobe_impl.h b/gr-blocks/lib/message_strobe_impl.h index 91111dd769..988990a247 100644 --- a/gr-blocks/lib/message_strobe_impl.h +++ b/gr-blocks/lib/message_strobe_impl.h @@ -19,7 +19,7 @@ namespace blocks { class BLOCKS_API message_strobe_impl : public message_strobe { private: - boost::shared_ptr<gr::thread::thread> d_thread; + std::shared_ptr<gr::thread::thread> d_thread; bool d_finished; long d_period_ms; pmt::pmt_t d_msg; diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc index 3a4b322294..793066c419 100644 --- a/gr-blocks/lib/message_strobe_random_impl.cc +++ b/gr-blocks/lib/message_strobe_random_impl.cc @@ -50,7 +50,7 @@ message_strobe_random_impl::message_strobe_random_impl( { // set up ports message_port_register_out(d_port); - d_thread = boost::shared_ptr<gr::thread::thread>( + d_thread = std::shared_ptr<gr::thread::thread>( new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this))); message_port_register_in(pmt::mp("set_msg")); diff --git a/gr-blocks/lib/message_strobe_random_impl.h b/gr-blocks/lib/message_strobe_random_impl.h index db66aa077f..9e1c898b31 100644 --- a/gr-blocks/lib/message_strobe_random_impl.h +++ b/gr-blocks/lib/message_strobe_random_impl.h @@ -28,7 +28,7 @@ private: std::poisson_distribution<> pd; //(d_mean_ms); std::normal_distribution<> nd; //(d_mean_ms, d_std_ms); std::uniform_real_distribution<> ud; //(d_mean_ms - d_std_ms, d_mean_ms + d_std_ms); - boost::shared_ptr<gr::thread::thread> d_thread; + std::shared_ptr<gr::thread::thread> d_thread; bool d_finished; pmt::pmt_t d_msg; const pmt::pmt_t d_port; diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc index 15c7ab46a6..6eb5e4224a 100644 --- a/gr-blocks/lib/qa_gr_flowgraph.cc +++ b/gr-blocks/lib/qa_gr_flowgraph.cc @@ -23,7 +23,7 @@ namespace blocks { class null_qa_source : virtual public sync_block { public: - typedef boost::shared_ptr<null_qa_source> sptr; + typedef std::shared_ptr<null_qa_source> sptr; static sptr make(size_t sizeof_stream_item); }; class null_source_qa_impl : public null_qa_source @@ -56,7 +56,7 @@ null_qa_source::sptr null_qa_source::make(size_t sizeof_stream_item) class null_qa_sink : virtual public sync_block { public: - typedef boost::shared_ptr<null_qa_sink> sptr; + typedef std::shared_ptr<null_qa_sink> sptr; static sptr make(size_t sizeof_stream_item); }; class null_sink_qa_impl : public null_qa_sink diff --git a/gr-blocks/lib/qa_gr_hier_block2_derived.cc b/gr-blocks/lib/qa_gr_hier_block2_derived.cc index eb25f6e7ca..b2af4921c6 100644 --- a/gr-blocks/lib/qa_gr_hier_block2_derived.cc +++ b/gr-blocks/lib/qa_gr_hier_block2_derived.cc @@ -23,7 +23,7 @@ // Declare a test C++ hierarchical block class gr_derived_block; -typedef boost::shared_ptr<gr_derived_block> gr_derived_block_sptr; +typedef std::shared_ptr<gr_derived_block> gr_derived_block_sptr; gr_derived_block_sptr gr_make_derived_block(); class gr_derived_block : public gr::hier_block2 diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h index c684ad013f..2e6c935471 100644 --- a/gr-blocks/lib/socket_pdu_impl.h +++ b/gr-blocks/lib/socket_pdu_impl.h @@ -34,20 +34,20 @@ private: const bool d_tcp_no_delay; // TCP server specific - boost::shared_ptr<boost::asio::ip::tcp::acceptor> d_acceptor_tcp; + std::shared_ptr<boost::asio::ip::tcp::acceptor> d_acceptor_tcp; void start_tcp_accept(); void tcp_server_send(pmt::pmt_t msg); void handle_tcp_accept(tcp_connection::sptr new_connection, const boost::system::error_code& error); // TCP client specific - boost::shared_ptr<boost::asio::ip::tcp::socket> d_tcp_socket; + std::shared_ptr<boost::asio::ip::tcp::socket> d_tcp_socket; void tcp_client_send(pmt::pmt_t msg); // UDP specific boost::asio::ip::udp::endpoint d_udp_endpoint; boost::asio::ip::udp::endpoint d_udp_endpoint_other; - boost::shared_ptr<boost::asio::ip::udp::socket> d_udp_socket; + std::shared_ptr<boost::asio::ip::udp::socket> d_udp_socket; void handle_udp_read(const boost::system::error_code& error, size_t bytes_transferred); void udp_send(pmt::pmt_t msg); diff --git a/gr-blocks/lib/tcp_connection.cc b/gr-blocks/lib/tcp_connection.cc index 086d1065f0..4634039ae4 100644 --- a/gr-blocks/lib/tcp_connection.cc +++ b/gr-blocks/lib/tcp_connection.cc @@ -45,7 +45,7 @@ void tcp_connection::send(pmt::pmt_t vector) size_t len = pmt::blob_length(vector); // Asio async_write() requires the buffer to remain valid until the handler is called. - boost::shared_ptr<char[]> txbuf(new char[len]); + std::shared_ptr<char[]> txbuf(new char[len]); size_t temp = 0; memcpy(txbuf.get(), pmt::uniform_vector_elements(vector, temp), len); diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h index 3841ce588e..2dd914ab71 100644 --- a/gr-blocks/lib/tcp_connection.h +++ b/gr-blocks/lib/tcp_connection.h @@ -14,7 +14,7 @@ #include <pmt/pmt.h> #include <boost/array.hpp> #include <boost/asio.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { @@ -35,7 +35,7 @@ private: bool no_delay = false); public: - typedef boost::shared_ptr<tcp_connection> sptr; + typedef std::shared_ptr<tcp_connection> sptr; static sptr make(boost::asio::io_service& io_service, int MTU = 10000, bool no_delay = false); @@ -45,7 +45,7 @@ public: void start(gr::basic_block* block); void send(pmt::pmt_t vector); void handle_read(const boost::system::error_code& error, size_t bytes_transferred); - void handle_write(boost::shared_ptr<char[]> txbuf, + void handle_write(std::shared_ptr<char[]> txbuf, const boost::system::error_code& error, size_t bytes_transferred) { diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h index d9b996b069..6e75432302 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.h +++ b/gr-blocks/lib/tcp_server_sink_impl.h @@ -31,7 +31,7 @@ private: std::set<boost::asio::ip::tcp::socket*> d_sockets; boost::asio::ip::tcp::acceptor d_acceptor; - boost::shared_ptr<uint8_t[]> d_buf; + std::shared_ptr<uint8_t[]> d_buf; enum { BUF_SIZE = 256 * 1024, }; diff --git a/gr-channels/include/gnuradio/channels/cfo_model.h b/gr-channels/include/gnuradio/channels/cfo_model.h index 3e592f9f31..20cf651ad8 100644 --- a/gr-channels/include/gnuradio/channels/cfo_model.h +++ b/gr-channels/include/gnuradio/channels/cfo_model.h @@ -33,7 +33,7 @@ class CHANNELS_API cfo_model : virtual public sync_block { public: // gr::channels::cfo_model::sptr - typedef boost::shared_ptr<cfo_model> sptr; + typedef std::shared_ptr<cfo_model> sptr; /*! \brief Build the carrier frequency offset model * diff --git a/gr-channels/include/gnuradio/channels/channel_model.h b/gr-channels/include/gnuradio/channels/channel_model.h index 1bd4806dea..8b81a63b24 100644 --- a/gr-channels/include/gnuradio/channels/channel_model.h +++ b/gr-channels/include/gnuradio/channels/channel_model.h @@ -44,7 +44,7 @@ class CHANNELS_API channel_model : virtual public hier_block2 { public: // gr::channels::channel_model::sptr - typedef boost::shared_ptr<channel_model> sptr; + typedef std::shared_ptr<channel_model> sptr; /*! \brief Build the channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/channel_model2.h b/gr-channels/include/gnuradio/channels/channel_model2.h index 06af433b7c..f5d5a1deac 100644 --- a/gr-channels/include/gnuradio/channels/channel_model2.h +++ b/gr-channels/include/gnuradio/channels/channel_model2.h @@ -60,7 +60,7 @@ class CHANNELS_API channel_model2 : virtual public hier_block2 { public: // gr::channels::channel_model2::sptr - typedef boost::shared_ptr<channel_model2> sptr; + typedef std::shared_ptr<channel_model2> sptr; /*! \brief Build the channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/dynamic_channel_model.h b/gr-channels/include/gnuradio/channels/dynamic_channel_model.h index c6c36b912d..c8b3065be3 100644 --- a/gr-channels/include/gnuradio/channels/dynamic_channel_model.h +++ b/gr-channels/include/gnuradio/channels/dynamic_channel_model.h @@ -37,7 +37,7 @@ class CHANNELS_API dynamic_channel_model : virtual public hier_block2 { public: // gr::channels::dynamic_channel_model::sptr - typedef boost::shared_ptr<dynamic_channel_model> sptr; + typedef std::shared_ptr<dynamic_channel_model> sptr; /*! \brief Build the dynamic channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/fading_model.h b/gr-channels/include/gnuradio/channels/fading_model.h index 694aab795a..5d625dfcee 100644 --- a/gr-channels/include/gnuradio/channels/fading_model.h +++ b/gr-channels/include/gnuradio/channels/fading_model.h @@ -31,7 +31,7 @@ class CHANNELS_API fading_model : virtual public sync_block { public: // gr::channels::channel_model::sptr - typedef boost::shared_ptr<fading_model> sptr; + typedef std::shared_ptr<fading_model> sptr; /*! \brief Build the channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/selective_fading_model.h b/gr-channels/include/gnuradio/channels/selective_fading_model.h index 9bec63d46b..b3120b4f15 100644 --- a/gr-channels/include/gnuradio/channels/selective_fading_model.h +++ b/gr-channels/include/gnuradio/channels/selective_fading_model.h @@ -34,7 +34,7 @@ class CHANNELS_API selective_fading_model : virtual public sync_block { public: // gr::channels::channel_model::sptr - typedef boost::shared_ptr<selective_fading_model> sptr; + typedef std::shared_ptr<selective_fading_model> sptr; /*! \brief Build the channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/selective_fading_model2.h b/gr-channels/include/gnuradio/channels/selective_fading_model2.h index 3e458190df..18b0f188eb 100644 --- a/gr-channels/include/gnuradio/channels/selective_fading_model2.h +++ b/gr-channels/include/gnuradio/channels/selective_fading_model2.h @@ -34,7 +34,7 @@ class CHANNELS_API selective_fading_model2 : virtual public sync_block { public: // gr::channels::channel_model2::sptr - typedef boost::shared_ptr<selective_fading_model2> sptr; + typedef std::shared_ptr<selective_fading_model2> sptr; /*! \brief Build the channel simulator. * diff --git a/gr-channels/include/gnuradio/channels/sro_model.h b/gr-channels/include/gnuradio/channels/sro_model.h index 64f1f353ad..35a467f192 100644 --- a/gr-channels/include/gnuradio/channels/sro_model.h +++ b/gr-channels/include/gnuradio/channels/sro_model.h @@ -31,7 +31,7 @@ class CHANNELS_API sro_model : virtual public block { public: // gr::channels::sro_model::sptr - typedef boost::shared_ptr<sro_model> sptr; + typedef std::shared_ptr<sro_model> sptr; /*! \brief Build the sample rate offset model * diff --git a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h index 9b207e5dfb..3e80606d6d 100644 --- a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h @@ -42,7 +42,7 @@ class DIGITAL_API additive_scrambler_bb : virtual public sync_block { public: // gr::digital::additive_scrambler_bb::sptr - typedef boost::shared_ptr<additive_scrambler_bb> sptr; + typedef std::shared_ptr<additive_scrambler_bb> sptr; /*! * \brief Create additive scrambler. diff --git a/gr-digital/include/gnuradio/digital/binary_slicer_fb.h b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h index 0e56e1ffb4..3bd58e67e5 100644 --- a/gr-digital/include/gnuradio/digital/binary_slicer_fb.h +++ b/gr-digital/include/gnuradio/digital/binary_slicer_fb.h @@ -29,7 +29,7 @@ class DIGITAL_API binary_slicer_fb : virtual public sync_block { public: // gr::digital::binary_slicer_fb::sptr - typedef boost::shared_ptr<binary_slicer_fb> sptr; + typedef std::shared_ptr<binary_slicer_fb> sptr; /*! * \brief Make binary symbol slicer block. diff --git a/gr-digital/include/gnuradio/digital/burst_shaper.h b/gr-digital/include/gnuradio/digital/burst_shaper.h index 57b2d23675..494d102023 100644 --- a/gr-digital/include/gnuradio/digital/burst_shaper.h +++ b/gr-digital/include/gnuradio/digital/burst_shaper.h @@ -52,7 +52,7 @@ template <class T> class DIGITAL_API burst_shaper : virtual public block { public: - typedef boost::shared_ptr<burst_shaper<T>> sptr; + typedef std::shared_ptr<burst_shaper<T>> sptr; /*! * Make a burst shaper block. diff --git a/gr-digital/include/gnuradio/digital/chunks_to_symbols.h b/gr-digital/include/gnuradio/digital/chunks_to_symbols.h index b81af69480..950977cdde 100644 --- a/gr-digital/include/gnuradio/digital/chunks_to_symbols.h +++ b/gr-digital/include/gnuradio/digital/chunks_to_symbols.h @@ -43,7 +43,7 @@ template <class IN_T, class OUT_T> class DIGITAL_API chunks_to_symbols : virtual public sync_interpolator { public: - typedef boost::shared_ptr<chunks_to_symbols<IN_T, OUT_T>> sptr; + typedef std::shared_ptr<chunks_to_symbols<IN_T, OUT_T>> sptr; /*! * Make a chunks-to-symbols block. diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h index 57f38bec99..f4e7a0c863 100644 --- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h +++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_cc.h @@ -60,7 +60,7 @@ class DIGITAL_API clock_recovery_mm_cc : virtual public block { public: // gr::digital::clock_recovery_mm_cc::sptr - typedef boost::shared_ptr<clock_recovery_mm_cc> sptr; + typedef std::shared_ptr<clock_recovery_mm_cc> sptr; /*! * Make a M&M clock recovery block. diff --git a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h index 926d070d39..d0672cf828 100644 --- a/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h +++ b/gr-digital/include/gnuradio/digital/clock_recovery_mm_ff.h @@ -57,7 +57,7 @@ class DIGITAL_API clock_recovery_mm_ff : virtual public block { public: // gr::digital::clock_recovery_mm_ff::sptr - typedef boost::shared_ptr<clock_recovery_mm_ff> sptr; + typedef std::shared_ptr<clock_recovery_mm_ff> sptr; /*! * Make a M&M clock recovery block. diff --git a/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h index 3071849dde..d398fabb47 100644 --- a/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/cma_equalizer_cc.h @@ -37,7 +37,7 @@ protected: public: // gr::digital::cma_equalizer_cc::sptr - typedef boost::shared_ptr<cma_equalizer_cc> sptr; + typedef std::shared_ptr<cma_equalizer_cc> sptr; /*! * Make a CMA Equalizer block diff --git a/gr-digital/include/gnuradio/digital/constellation.h b/gr-digital/include/gnuradio/digital/constellation.h index d87e221263..4924733d6d 100644 --- a/gr-digital/include/gnuradio/digital/constellation.h +++ b/gr-digital/include/gnuradio/digital/constellation.h @@ -16,7 +16,6 @@ #include <gnuradio/gr_complex.h> #include <pmt/pmt.h> #include <boost/any.hpp> -#include <boost/enable_shared_from_this.hpp> #include <vector> namespace gr { @@ -29,7 +28,7 @@ namespace digital { /************************************************************/ class constellation; -typedef boost::shared_ptr<constellation> constellation_sptr; +typedef std::shared_ptr<constellation> constellation_sptr; /*! * \brief An abstracted constellation object @@ -47,7 +46,7 @@ typedef boost::shared_ptr<constellation> constellation_sptr; * from this class and overloaded to perform optimized slicing and * constellation mappings. */ -class DIGITAL_API constellation : public boost::enable_shared_from_this<constellation> +class DIGITAL_API constellation : public std::enable_shared_from_this<constellation> { public: constellation(std::vector<gr_complex> constell, @@ -224,7 +223,7 @@ protected: class DIGITAL_API constellation_calcdist : public constellation { public: - typedef boost::shared_ptr<constellation_calcdist> sptr; + typedef std::shared_ptr<constellation_calcdist> sptr; /*! * Make a general constellation object that calculates the Euclidean distance for hard @@ -325,7 +324,7 @@ private: class DIGITAL_API constellation_rect : public constellation_sector { public: - typedef boost::shared_ptr<constellation_rect> sptr; + typedef std::shared_ptr<constellation_rect> sptr; /*! * Make a rectangular constellation object. @@ -394,7 +393,7 @@ private: class DIGITAL_API constellation_expl_rect : public constellation_rect { public: - typedef boost::shared_ptr<constellation_expl_rect> sptr; + typedef std::shared_ptr<constellation_expl_rect> sptr; static sptr make(std::vector<gr_complex> constellation, std::vector<int> pre_diff_code, @@ -444,7 +443,7 @@ private: class DIGITAL_API constellation_psk : public constellation_sector { public: - typedef boost::shared_ptr<constellation_psk> sptr; + typedef std::shared_ptr<constellation_psk> sptr; // public constructor static sptr make(std::vector<gr_complex> constell, @@ -483,7 +482,7 @@ protected: class DIGITAL_API constellation_bpsk : public constellation { public: - typedef boost::shared_ptr<constellation_bpsk> sptr; + typedef std::shared_ptr<constellation_bpsk> sptr; // public constructor static sptr make(); @@ -519,7 +518,7 @@ protected: class DIGITAL_API constellation_qpsk : public constellation { public: - typedef boost::shared_ptr<constellation_qpsk> sptr; + typedef std::shared_ptr<constellation_qpsk> sptr; // public constructor static sptr make(); @@ -554,7 +553,7 @@ protected: class DIGITAL_API constellation_dqpsk : public constellation { public: - typedef boost::shared_ptr<constellation_dqpsk> sptr; + typedef std::shared_ptr<constellation_dqpsk> sptr; // public constructor static sptr make(); @@ -591,7 +590,7 @@ protected: class DIGITAL_API constellation_8psk : public constellation { public: - typedef boost::shared_ptr<constellation_8psk> sptr; + typedef std::shared_ptr<constellation_8psk> sptr; // public constructor static sptr make(); @@ -627,7 +626,7 @@ protected: class DIGITAL_API constellation_8psk_natural : public constellation { public: - typedef boost::shared_ptr<constellation_8psk_natural> sptr; + typedef std::shared_ptr<constellation_8psk_natural> sptr; // public constructor static sptr make(); @@ -665,7 +664,7 @@ protected: class DIGITAL_API constellation_16qam : public constellation { public: - typedef boost::shared_ptr<constellation_16qam> sptr; + typedef std::shared_ptr<constellation_16qam> sptr; // public constructor static sptr make(); diff --git a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h index a47af55080..f53f9fdd79 100644 --- a/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h +++ b/gr-digital/include/gnuradio/digital/constellation_decoder_cb.h @@ -31,7 +31,7 @@ class DIGITAL_API constellation_decoder_cb : virtual public block { public: // gr::digital::constellation_decoder_cb::sptr - typedef boost::shared_ptr<constellation_decoder_cb> sptr; + typedef std::shared_ptr<constellation_decoder_cb> sptr; /*! * \brief Make constellation decoder block. diff --git a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h index f29a14fac0..333d717c2b 100644 --- a/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h +++ b/gr-digital/include/gnuradio/digital/constellation_receiver_cb.h @@ -48,7 +48,7 @@ class DIGITAL_API constellation_receiver_cb : virtual public block, { public: // gr::digital::constellation_receiver_cb::sptr - typedef boost::shared_ptr<constellation_receiver_cb> sptr; + typedef std::shared_ptr<constellation_receiver_cb> sptr; /*! * \brief Constructs a constellation receiver that (phase/fine diff --git a/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h b/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h index 75e468bfd4..8d3772cf92 100644 --- a/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h +++ b/gr-digital/include/gnuradio/digital/constellation_soft_decoder_cf.h @@ -31,7 +31,7 @@ class DIGITAL_API constellation_soft_decoder_cf : virtual public sync_interpolat { public: // gr::digital::constellation_soft_decoder_cf::sptr - typedef boost::shared_ptr<constellation_soft_decoder_cf> sptr; + typedef std::shared_ptr<constellation_soft_decoder_cf> sptr; /*! * \brief Make constellation decoder block. diff --git a/gr-digital/include/gnuradio/digital/corr_est_cc.h b/gr-digital/include/gnuradio/digital/corr_est_cc.h index da0f84ceb6..78acb4075e 100644 --- a/gr-digital/include/gnuradio/digital/corr_est_cc.h +++ b/gr-digital/include/gnuradio/digital/corr_est_cc.h @@ -78,7 +78,7 @@ typedef enum { class DIGITAL_API corr_est_cc : virtual public sync_block { public: - typedef boost::shared_ptr<corr_est_cc> sptr; + typedef std::shared_ptr<corr_est_cc> sptr; /*! * Make a block that correlates against the \p symbols vector diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h index 2c89b560e1..de54a2585e 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb.h @@ -37,7 +37,7 @@ class DIGITAL_API correlate_access_code_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_bb::sptr - typedef boost::shared_ptr<correlate_access_code_bb> sptr; + typedef std::shared_ptr<correlate_access_code_bb> sptr; /*! * Make a correlate_access_code block. diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h index 3ff172fde1..f1aff6872d 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_bb_ts.h @@ -41,7 +41,7 @@ class DIGITAL_API correlate_access_code_bb_ts : virtual public block { public: // gr::digital::correlate_access_code_bb_ts::sptr - typedef boost::shared_ptr<correlate_access_code_bb_ts> sptr; + typedef std::shared_ptr<correlate_access_code_bb_ts> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h index 335c8cc780..c4ce06cf73 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_ff_ts.h @@ -41,7 +41,7 @@ class DIGITAL_API correlate_access_code_ff_ts : virtual public block { public: // gr::digital::correlate_access_code_ff_ts::sptr - typedef boost::shared_ptr<correlate_access_code_ff_ts> sptr; + typedef std::shared_ptr<correlate_access_code_ff_ts> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h index b44f9f9277..9ab0da660b 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_bb.h @@ -34,7 +34,7 @@ class DIGITAL_API correlate_access_code_tag_bb : virtual public sync_block { public: // gr::digital::correlate_access_code_tag_bb::sptr - typedef boost::shared_ptr<correlate_access_code_tag_bb> sptr; + typedef std::shared_ptr<correlate_access_code_tag_bb> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h index e6f7962059..bc921ec1d4 100644 --- a/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h +++ b/gr-digital/include/gnuradio/digital/correlate_access_code_tag_ff.h @@ -35,7 +35,7 @@ class DIGITAL_API correlate_access_code_tag_ff : virtual public sync_block { public: // gr::digital::correlate_access_code_tag_ff::sptr - typedef boost::shared_ptr<correlate_access_code_tag_ff> sptr; + typedef std::shared_ptr<correlate_access_code_tag_ff> sptr; /*! * \param access_code is represented with 1 byte per bit, diff --git a/gr-digital/include/gnuradio/digital/costas_loop_cc.h b/gr-digital/include/gnuradio/digital/costas_loop_cc.h index cd7f45c353..3065b42065 100644 --- a/gr-digital/include/gnuradio/digital/costas_loop_cc.h +++ b/gr-digital/include/gnuradio/digital/costas_loop_cc.h @@ -55,7 +55,7 @@ class DIGITAL_API costas_loop_cc : virtual public sync_block, { public: // gr::digital::costas_loop_cc::sptr - typedef boost::shared_ptr<costas_loop_cc> sptr; + typedef std::shared_ptr<costas_loop_cc> sptr; /*! * Make a Costas loop carrier recovery block. diff --git a/gr-digital/include/gnuradio/digital/cpmmod_bc.h b/gr-digital/include/gnuradio/digital/cpmmod_bc.h index b7d2faf0bd..dca28e551f 100644 --- a/gr-digital/include/gnuradio/digital/cpmmod_bc.h +++ b/gr-digital/include/gnuradio/digital/cpmmod_bc.h @@ -38,7 +38,7 @@ class DIGITAL_API cpmmod_bc : virtual public hier_block2 { public: // gr::digital::cpmmod_bc::sptr - typedef boost::shared_ptr<cpmmod_bc> sptr; + typedef std::shared_ptr<cpmmod_bc> sptr; /*! * Make CPM modulator block. diff --git a/gr-digital/include/gnuradio/digital/crc32_async_bb.h b/gr-digital/include/gnuradio/digital/crc32_async_bb.h index 4e3e93c0bb..86dfd06ee7 100644 --- a/gr-digital/include/gnuradio/digital/crc32_async_bb.h +++ b/gr-digital/include/gnuradio/digital/crc32_async_bb.h @@ -44,7 +44,7 @@ namespace digital { class DIGITAL_API crc32_async_bb : virtual public block { public: - typedef boost::shared_ptr<crc32_async_bb> sptr; + typedef std::shared_ptr<crc32_async_bb> sptr; /*! * \param check Set to true if you want to check CRC, false to create CRC. diff --git a/gr-digital/include/gnuradio/digital/crc32_bb.h b/gr-digital/include/gnuradio/digital/crc32_bb.h index 4fa111de27..18153e8d2c 100644 --- a/gr-digital/include/gnuradio/digital/crc32_bb.h +++ b/gr-digital/include/gnuradio/digital/crc32_bb.h @@ -33,7 +33,7 @@ namespace digital { class DIGITAL_API crc32_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<crc32_bb> sptr; + typedef std::shared_ptr<crc32_bb> sptr; /*! * \param check Set to true if you want to check CRC, false to create CRC. diff --git a/gr-digital/include/gnuradio/digital/descrambler_bb.h b/gr-digital/include/gnuradio/digital/descrambler_bb.h index e7b0c1fcd6..446754f58f 100644 --- a/gr-digital/include/gnuradio/digital/descrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/descrambler_bb.h @@ -30,7 +30,7 @@ class DIGITAL_API descrambler_bb : virtual public sync_block { public: // gr::digital::descrambler_bb::sptr - typedef boost::shared_ptr<descrambler_bb> sptr; + typedef std::shared_ptr<descrambler_bb> sptr; /*! * \brief Make a descrambler block. diff --git a/gr-digital/include/gnuradio/digital/diff_decoder_bb.h b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h index 4cefe3ee34..e92e001dd1 100644 --- a/gr-digital/include/gnuradio/digital/diff_decoder_bb.h +++ b/gr-digital/include/gnuradio/digital/diff_decoder_bb.h @@ -29,7 +29,7 @@ class DIGITAL_API diff_decoder_bb : virtual public sync_block { public: // gr::digital::diff_decoder_bb::sptr - typedef boost::shared_ptr<diff_decoder_bb> sptr; + typedef std::shared_ptr<diff_decoder_bb> sptr; /*! * Make a differential decoder block. diff --git a/gr-digital/include/gnuradio/digital/diff_encoder_bb.h b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h index e5aed700f1..183be32873 100644 --- a/gr-digital/include/gnuradio/digital/diff_encoder_bb.h +++ b/gr-digital/include/gnuradio/digital/diff_encoder_bb.h @@ -29,7 +29,7 @@ class DIGITAL_API diff_encoder_bb : virtual public sync_block { public: // gr::digital::diff_encoder_bb::sptr - typedef boost::shared_ptr<diff_encoder_bb> sptr; + typedef std::shared_ptr<diff_encoder_bb> sptr; /*! * Make a differential encoder block. diff --git a/gr-digital/include/gnuradio/digital/diff_phasor_cc.h b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h index 90197b8ecb..a221df3f85 100644 --- a/gr-digital/include/gnuradio/digital/diff_phasor_cc.h +++ b/gr-digital/include/gnuradio/digital/diff_phasor_cc.h @@ -31,7 +31,7 @@ class DIGITAL_API diff_phasor_cc : virtual public sync_block { public: // gr::digital::diff_phasor_cc::sptr - typedef boost::shared_ptr<diff_phasor_cc> sptr; + typedef std::shared_ptr<diff_phasor_cc> sptr; /*! * Make a differential phasor decoding block. diff --git a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h index 4bce4f8f71..66f348f6d7 100644 --- a/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h +++ b/gr-digital/include/gnuradio/digital/fll_band_edge_cc.h @@ -73,7 +73,7 @@ class DIGITAL_API fll_band_edge_cc : virtual public sync_block, { public: // gr::digital::fll_band_edge_cc::sptr - typedef boost::shared_ptr<fll_band_edge_cc> sptr; + typedef std::shared_ptr<fll_band_edge_cc> sptr; /*! * Make an FLL block. diff --git a/gr-digital/include/gnuradio/digital/framer_sink_1.h b/gr-digital/include/gnuradio/digital/framer_sink_1.h index 2fc791eeda..1a9cfb993a 100644 --- a/gr-digital/include/gnuradio/digital/framer_sink_1.h +++ b/gr-digital/include/gnuradio/digital/framer_sink_1.h @@ -40,7 +40,7 @@ class DIGITAL_API framer_sink_1 : virtual public sync_block { public: // gr::digital::framer_sink_1::sptr - typedef boost::shared_ptr<framer_sink_1> sptr; + typedef std::shared_ptr<framer_sink_1> sptr; /*! * Make a framer_sink_1 block. diff --git a/gr-digital/include/gnuradio/digital/glfsr_source_b.h b/gr-digital/include/gnuradio/digital/glfsr_source_b.h index fb6068a639..eb5b49e5db 100644 --- a/gr-digital/include/gnuradio/digital/glfsr_source_b.h +++ b/gr-digital/include/gnuradio/digital/glfsr_source_b.h @@ -25,7 +25,7 @@ class DIGITAL_API glfsr_source_b : virtual public sync_block { public: // gr::digital::glfsr_source_b::sptr - typedef boost::shared_ptr<glfsr_source_b> sptr; + typedef std::shared_ptr<glfsr_source_b> sptr; /*! * Make a Galois LFSR pseudo-random source block. diff --git a/gr-digital/include/gnuradio/digital/glfsr_source_f.h b/gr-digital/include/gnuradio/digital/glfsr_source_f.h index 94d16e0334..adc0a8d4f2 100644 --- a/gr-digital/include/gnuradio/digital/glfsr_source_f.h +++ b/gr-digital/include/gnuradio/digital/glfsr_source_f.h @@ -25,7 +25,7 @@ class DIGITAL_API glfsr_source_f : virtual public sync_block { public: // gr::digital::glfsr_source_f::sptr - typedef boost::shared_ptr<glfsr_source_f> sptr; + typedef std::shared_ptr<glfsr_source_f> sptr; /*! * Make a Galois LFSR pseudo-random source block. diff --git a/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h index f70cdc5edd..fd20f294ad 100644 --- a/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h +++ b/gr-digital/include/gnuradio/digital/hdlc_deframer_bp.h @@ -27,7 +27,7 @@ namespace digital { class DIGITAL_API hdlc_deframer_bp : virtual public gr::sync_block { public: - typedef boost::shared_ptr<hdlc_deframer_bp> sptr; + typedef std::shared_ptr<hdlc_deframer_bp> sptr; /*! * \brief Return a shared_ptr to a new instance of digital::hdlc_deframer. diff --git a/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h index 9b3f2ba8dd..af852517ae 100644 --- a/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h +++ b/gr-digital/include/gnuradio/digital/hdlc_framer_pb.h @@ -36,7 +36,7 @@ namespace digital { class DIGITAL_API hdlc_framer_pb : virtual public gr::sync_block { public: - typedef boost::shared_ptr<hdlc_framer_pb> sptr; + typedef std::shared_ptr<hdlc_framer_pb> sptr; /*! * \brief Return a shared_ptr to a new instance of digital::hdlc_framer. diff --git a/gr-digital/include/gnuradio/digital/header_format_base.h b/gr-digital/include/gnuradio/digital/header_format_base.h index 0a3fb7c729..18b4669cef 100644 --- a/gr-digital/include/gnuradio/digital/header_format_base.h +++ b/gr-digital/include/gnuradio/digital/header_format_base.h @@ -14,7 +14,6 @@ #include <gnuradio/digital/header_buffer.h> #include <gnuradio/logger.h> #include <pmt/pmt.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -109,10 +108,10 @@ namespace digital { * \sa header_format_counter */ class DIGITAL_API header_format_base - : public boost::enable_shared_from_this<gr::digital::header_format_base> + : public std::enable_shared_from_this<gr::digital::header_format_base> { public: - typedef boost::shared_ptr<header_format_base> sptr; + typedef std::shared_ptr<header_format_base> sptr; header_format_base(); virtual ~header_format_base(); diff --git a/gr-digital/include/gnuradio/digital/header_format_default.h b/gr-digital/include/gnuradio/digital/header_format_default.h index 8170bbc835..402b5efee1 100644 --- a/gr-digital/include/gnuradio/digital/header_format_default.h +++ b/gr-digital/include/gnuradio/digital/header_format_default.h @@ -15,7 +15,6 @@ #include <gnuradio/digital/header_format_base.h> #include <gnuradio/logger.h> #include <pmt/pmt.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { diff --git a/gr-digital/include/gnuradio/digital/header_payload_demux.h b/gr-digital/include/gnuradio/digital/header_payload_demux.h index 8797cb9801..a1f41c3872 100644 --- a/gr-digital/include/gnuradio/digital/header_payload_demux.h +++ b/gr-digital/include/gnuradio/digital/header_payload_demux.h @@ -150,7 +150,7 @@ namespace digital { class DIGITAL_API header_payload_demux : virtual public block { public: - typedef boost::shared_ptr<header_payload_demux> sptr; + typedef std::shared_ptr<header_payload_demux> sptr; /*! * \param header_len Number of symbols per header diff --git a/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h index ccfcf1b56e..dde885585a 100644 --- a/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/kurtotic_equalizer_cc.h @@ -36,7 +36,7 @@ protected: public: // gr::digital::kurtotic_equalizer_cc::sptr - typedef boost::shared_ptr<kurtotic_equalizer_cc> sptr; + typedef std::shared_ptr<kurtotic_equalizer_cc> sptr; static sptr make(int num_taps, float mu); diff --git a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h index 309ea80b59..9c187e165c 100644 --- a/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h +++ b/gr-digital/include/gnuradio/digital/lms_dd_equalizer_cc.h @@ -60,7 +60,7 @@ protected: public: // gr::digital::lms_dd_equalizer_cc::sptr - typedef boost::shared_ptr<lms_dd_equalizer_cc> sptr; + typedef std::shared_ptr<lms_dd_equalizer_cc> sptr; /*! * Make an LMS decision-directed equalizer diff --git a/gr-digital/include/gnuradio/digital/map_bb.h b/gr-digital/include/gnuradio/digital/map_bb.h index 16fc0c4836..40150b8727 100644 --- a/gr-digital/include/gnuradio/digital/map_bb.h +++ b/gr-digital/include/gnuradio/digital/map_bb.h @@ -32,7 +32,7 @@ class DIGITAL_API map_bb : virtual public sync_block { public: // gr::digital::map_bb::sptr - typedef boost::shared_ptr<map_bb> sptr; + typedef std::shared_ptr<map_bb> sptr; /*! * Make a map block. diff --git a/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h index 5391ea639a..61d24cee44 100644 --- a/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h +++ b/gr-digital/include/gnuradio/digital/mpsk_snr_est_cc.h @@ -41,7 +41,7 @@ class DIGITAL_API mpsk_snr_est_cc : virtual public sync_block { public: // gr::digital::mpsk_snr_est_cc::sptr - typedef boost::shared_ptr<mpsk_snr_est_cc> sptr; + typedef std::shared_ptr<mpsk_snr_est_cc> sptr; /*! Factory function returning shared pointer of this class * diff --git a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h index db0818d868..7dbc618ad7 100644 --- a/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h +++ b/gr-digital/include/gnuradio/digital/msk_timing_recovery_cc.h @@ -34,7 +34,7 @@ namespace digital { class DIGITAL_API msk_timing_recovery_cc : virtual public gr::block { public: - typedef boost::shared_ptr<msk_timing_recovery_cc> sptr; + typedef std::shared_ptr<msk_timing_recovery_cc> sptr; /*! * \brief Make an MSK timing recovery block. diff --git a/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h index 3058f5296e..130a3e21c2 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_carrier_allocator_cvc.h @@ -59,7 +59,7 @@ namespace digital { class DIGITAL_API ofdm_carrier_allocator_cvc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_carrier_allocator_cvc> sptr; + typedef std::shared_ptr<ofdm_carrier_allocator_cvc> sptr; virtual std::string len_tag_key() = 0; virtual const int fft_len() = 0; diff --git a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h index e27a73343f..259215b020 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_chanest_vcvc.h @@ -45,7 +45,7 @@ namespace digital { class DIGITAL_API ofdm_chanest_vcvc : virtual public block { public: - typedef boost::shared_ptr<ofdm_chanest_vcvc> sptr; + typedef std::shared_ptr<ofdm_chanest_vcvc> sptr; /*! * \param sync_symbol1 First synchronisation symbol in the frequency domain. Its diff --git a/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h index 87f4f8bfdb..81bea6980c 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h +++ b/gr-digital/include/gnuradio/digital/ofdm_cyclic_prefixer.h @@ -50,7 +50,7 @@ namespace digital { class DIGITAL_API ofdm_cyclic_prefixer : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_cyclic_prefixer> sptr; + typedef std::shared_ptr<ofdm_cyclic_prefixer> sptr; /*! * \param input_size IFFT length (i.e. length of the OFDM symbols). diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h index e6b98a1d11..328523295f 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_base.h @@ -13,7 +13,6 @@ #include <gnuradio/digital/api.h> #include <gnuradio/gr_complex.h> #include <gnuradio/tags.h> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -24,13 +23,13 @@ namespace digital { * \ingroup equalizers_blk */ class DIGITAL_API ofdm_equalizer_base - : public boost::enable_shared_from_this<ofdm_equalizer_base> + : public std::enable_shared_from_this<ofdm_equalizer_base> { protected: int d_fft_len; public: - typedef boost::shared_ptr<ofdm_equalizer_base> sptr; + typedef std::shared_ptr<ofdm_equalizer_base> sptr; ofdm_equalizer_base(int fft_len); virtual ~ofdm_equalizer_base(); @@ -76,7 +75,7 @@ protected: std::vector<gr_complex> d_channel_state; public: - typedef boost::shared_ptr<ofdm_equalizer_1d_pilots> sptr; + typedef std::shared_ptr<ofdm_equalizer_1d_pilots> sptr; ofdm_equalizer_1d_pilots(int fft_len, const std::vector<std::vector<int>>& occupied_carriers, diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h index d07cf709cd..54c9c43fea 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_simpledfe.h @@ -52,7 +52,7 @@ namespace digital { class DIGITAL_API ofdm_equalizer_simpledfe : public ofdm_equalizer_1d_pilots { public: - typedef boost::shared_ptr<ofdm_equalizer_simpledfe> sptr; + typedef std::shared_ptr<ofdm_equalizer_simpledfe> sptr; ofdm_equalizer_simpledfe(int fft_len, const gr::digital::constellation_sptr& constellation, diff --git a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h index af5d85d550..39ef12e793 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h +++ b/gr-digital/include/gnuradio/digital/ofdm_equalizer_static.h @@ -34,7 +34,7 @@ namespace digital { class DIGITAL_API ofdm_equalizer_static : public ofdm_equalizer_1d_pilots { public: - typedef boost::shared_ptr<ofdm_equalizer_static> sptr; + typedef std::shared_ptr<ofdm_equalizer_static> sptr; ofdm_equalizer_static(int fft_len, const std::vector<std::vector<int>>& occupied_carriers = diff --git a/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h index df1169a573..9d92d2d876 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h @@ -41,7 +41,7 @@ namespace digital { class DIGITAL_API ofdm_frame_equalizer_vcvc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_frame_equalizer_vcvc> sptr; + typedef std::shared_ptr<ofdm_frame_equalizer_vcvc> sptr; /*! * \param equalizer The equalizer object that will do the actual work diff --git a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h index 5da437e78e..aec42b290c 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h +++ b/gr-digital/include/gnuradio/digital/ofdm_serializer_vcc.h @@ -43,7 +43,7 @@ namespace digital { class DIGITAL_API ofdm_serializer_vcc : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<ofdm_serializer_vcc> sptr; + typedef std::shared_ptr<ofdm_serializer_vcc> sptr; /*! * \param fft_len FFT length diff --git a/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h index f2909c57bd..2fe18b1215 100644 --- a/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h +++ b/gr-digital/include/gnuradio/digital/ofdm_sync_sc_cfb.h @@ -52,7 +52,7 @@ namespace digital { class DIGITAL_API ofdm_sync_sc_cfb : virtual public hier_block2 { public: - typedef boost::shared_ptr<ofdm_sync_sc_cfb> sptr; + typedef std::shared_ptr<ofdm_sync_sc_cfb> sptr; /*! \param fft_len FFT length * \param cp_len Length of the guard interval (cyclic prefix) in samples diff --git a/gr-digital/include/gnuradio/digital/packet_header_default.h b/gr-digital/include/gnuradio/digital/packet_header_default.h index f6d90bd0e6..24ec1a1f05 100644 --- a/gr-digital/include/gnuradio/digital/packet_header_default.h +++ b/gr-digital/include/gnuradio/digital/packet_header_default.h @@ -13,7 +13,6 @@ #include <gnuradio/digital/api.h> #include <gnuradio/tags.h> #include <boost/crc.hpp> -#include <boost/enable_shared_from_this.hpp> namespace gr { namespace digital { @@ -35,10 +34,10 @@ namespace digital { * this class to create packet headers from data streams. */ class DIGITAL_API packet_header_default - : public boost::enable_shared_from_this<gr::digital::packet_header_default> + : public std::enable_shared_from_this<gr::digital::packet_header_default> { public: - typedef boost::shared_ptr<packet_header_default> sptr; + typedef std::shared_ptr<packet_header_default> sptr; packet_header_default(long header_len, const std::string& len_tag_key = "packet_len", diff --git a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h index 184c1abf4f..7599849f70 100644 --- a/gr-digital/include/gnuradio/digital/packet_header_ofdm.h +++ b/gr-digital/include/gnuradio/digital/packet_header_ofdm.h @@ -24,7 +24,7 @@ namespace digital { class DIGITAL_API packet_header_ofdm : public packet_header_default { public: - typedef boost::shared_ptr<packet_header_ofdm> sptr; + typedef std::shared_ptr<packet_header_ofdm> sptr; packet_header_ofdm(const std::vector<std::vector<int>>& occupied_carriers, int n_syms, diff --git a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h index f99cb4d72f..84e5f7c0f3 100644 --- a/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h +++ b/gr-digital/include/gnuradio/digital/packet_headergenerator_bb.h @@ -32,7 +32,7 @@ namespace digital { class DIGITAL_API packet_headergenerator_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<packet_headergenerator_bb> sptr; + typedef std::shared_ptr<packet_headergenerator_bb> sptr; /* \param header_formatter A header formatter object. * \param len_tag_key Length tag key. Note that for header generation, diff --git a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h index adec96b13f..386d3953c1 100644 --- a/gr-digital/include/gnuradio/digital/packet_headerparser_b.h +++ b/gr-digital/include/gnuradio/digital/packet_headerparser_b.h @@ -37,7 +37,7 @@ namespace digital { class DIGITAL_API packet_headerparser_b : virtual public sync_block { public: - typedef boost::shared_ptr<packet_headerparser_b> sptr; + typedef std::shared_ptr<packet_headerparser_b> sptr; /*! * \param header_formatter Header object. This should be the same as used for diff --git a/gr-digital/include/gnuradio/digital/packet_sink.h b/gr-digital/include/gnuradio/digital/packet_sink.h index e91bc35755..744ec3165f 100644 --- a/gr-digital/include/gnuradio/digital/packet_sink.h +++ b/gr-digital/include/gnuradio/digital/packet_sink.h @@ -45,7 +45,7 @@ class DIGITAL_API packet_sink : virtual public sync_block { public: // gr::digital::packet_sink::sptr - typedef boost::shared_ptr<packet_sink> sptr; + typedef std::shared_ptr<packet_sink> sptr; /*! * Make a packet_sink block. diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h index 4785526d91..3357c48c7c 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_ccf.h @@ -145,7 +145,7 @@ class DIGITAL_API pfb_clock_sync_ccf : virtual public block { public: // gr::digital::pfb_clock_sync_ccf::sptr - typedef boost::shared_ptr<pfb_clock_sync_ccf> sptr; + typedef std::shared_ptr<pfb_clock_sync_ccf> sptr; /*! * Build the polyphase filterbank timing synchronizer. diff --git a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h index c06ac77302..757d3f2264 100644 --- a/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h +++ b/gr-digital/include/gnuradio/digital/pfb_clock_sync_fff.h @@ -144,7 +144,7 @@ class DIGITAL_API pfb_clock_sync_fff : virtual public block { public: // gr::digital::pfb_clock_sync_fff::sptr - typedef boost::shared_ptr<pfb_clock_sync_fff> sptr; + typedef std::shared_ptr<pfb_clock_sync_fff> sptr; /*! * Build the polyphase filterbank timing synchronizer. diff --git a/gr-digital/include/gnuradio/digital/pn_correlator_cc.h b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h index 0453b16ef4..c94f1530bb 100644 --- a/gr-digital/include/gnuradio/digital/pn_correlator_cc.h +++ b/gr-digital/include/gnuradio/digital/pn_correlator_cc.h @@ -30,7 +30,7 @@ class DIGITAL_API pn_correlator_cc : virtual public sync_decimator { public: // gr::digital::pn_correlator_cc::sptr - typedef boost::shared_ptr<pn_correlator_cc> sptr; + typedef std::shared_ptr<pn_correlator_cc> sptr; /*! * \brief Make PN code sequential search correlator block. diff --git a/gr-digital/include/gnuradio/digital/probe_density_b.h b/gr-digital/include/gnuradio/digital/probe_density_b.h index 16f2a26cc1..2f8afe0f0c 100644 --- a/gr-digital/include/gnuradio/digital/probe_density_b.h +++ b/gr-digital/include/gnuradio/digital/probe_density_b.h @@ -29,7 +29,7 @@ class DIGITAL_API probe_density_b : virtual public sync_block { public: // gr::digital::probe_density_b::sptr - typedef boost::shared_ptr<probe_density_b> sptr; + typedef std::shared_ptr<probe_density_b> sptr; /*! * Make a density probe block. diff --git a/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h index 83cd4aaa03..c56ffc2771 100644 --- a/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h +++ b/gr-digital/include/gnuradio/digital/probe_mpsk_snr_est_c.h @@ -48,7 +48,7 @@ class DIGITAL_API probe_mpsk_snr_est_c : virtual public sync_block { public: // gr::digital::probe_mpsk_snr_est_c::sptr - typedef boost::shared_ptr<probe_mpsk_snr_est_c> sptr; + typedef std::shared_ptr<probe_mpsk_snr_est_c> sptr; /*! Make an MPSK SNR probe. * diff --git a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h index b4a4bdf759..41ed4b4c9c 100644 --- a/gr-digital/include/gnuradio/digital/protocol_formatter_async.h +++ b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h @@ -59,7 +59,7 @@ namespace digital { class DIGITAL_API protocol_formatter_async : virtual public block { public: - typedef boost::shared_ptr<protocol_formatter_async> sptr; + typedef std::shared_ptr<protocol_formatter_async> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h index 13cc53e22b..602b4f0b5d 100644 --- a/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h +++ b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h @@ -47,7 +47,7 @@ namespace digital { class DIGITAL_API protocol_formatter_bb : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<protocol_formatter_bb> sptr; + typedef std::shared_ptr<protocol_formatter_bb> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/protocol_parser_b.h b/gr-digital/include/gnuradio/digital/protocol_parser_b.h index ba025997c4..fabaa8a77b 100644 --- a/gr-digital/include/gnuradio/digital/protocol_parser_b.h +++ b/gr-digital/include/gnuradio/digital/protocol_parser_b.h @@ -51,7 +51,7 @@ namespace digital { class DIGITAL_API protocol_parser_b : virtual public sync_block { public: - typedef boost::shared_ptr<protocol_parser_b> sptr; + typedef std::shared_ptr<protocol_parser_b> sptr; /*! * Make a packet header block using a given \p format. diff --git a/gr-digital/include/gnuradio/digital/scrambler_bb.h b/gr-digital/include/gnuradio/digital/scrambler_bb.h index c9ad2cad9e..51f43b3bc8 100644 --- a/gr-digital/include/gnuradio/digital/scrambler_bb.h +++ b/gr-digital/include/gnuradio/digital/scrambler_bb.h @@ -30,7 +30,7 @@ class DIGITAL_API scrambler_bb : virtual public sync_block { public: // gr::digital::scrambler_bb::sptr - typedef boost::shared_ptr<scrambler_bb> sptr; + typedef std::shared_ptr<scrambler_bb> sptr; /*! * Make a scramber block. diff --git a/gr-digital/include/gnuradio/digital/simple_correlator.h b/gr-digital/include/gnuradio/digital/simple_correlator.h index 740820f5c2..e59c0aa05b 100644 --- a/gr-digital/include/gnuradio/digital/simple_correlator.h +++ b/gr-digital/include/gnuradio/digital/simple_correlator.h @@ -26,7 +26,7 @@ class DIGITAL_API simple_correlator : virtual public block { public: // gr::digital::simple_correlator::sptr - typedef boost::shared_ptr<simple_correlator> sptr; + typedef std::shared_ptr<simple_correlator> sptr; static sptr make(int payload_bytesize); }; diff --git a/gr-digital/include/gnuradio/digital/simple_framer.h b/gr-digital/include/gnuradio/digital/simple_framer.h index 6bf7535156..778ef7f14f 100644 --- a/gr-digital/include/gnuradio/digital/simple_framer.h +++ b/gr-digital/include/gnuradio/digital/simple_framer.h @@ -31,7 +31,7 @@ class DIGITAL_API simple_framer : virtual public block { public: // gr::digital::simple_framer::sptr - typedef boost::shared_ptr<simple_framer> sptr; + typedef std::shared_ptr<simple_framer> sptr; /*! * Make a simple_framer block. diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h index 36fe2d7bfa..af65940b41 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_cc.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_cc.h @@ -44,7 +44,7 @@ class DIGITAL_API symbol_sync_cc : virtual public block { public: // gr::digital::symbol_sync_cc::sptr - typedef boost::shared_ptr<symbol_sync_cc> sptr; + typedef std::shared_ptr<symbol_sync_cc> sptr; /*! * Make a Symbol Synchronizer block. diff --git a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h index c725fb4c93..b8c1716d5a 100644 --- a/gr-digital/include/gnuradio/digital/symbol_sync_ff.h +++ b/gr-digital/include/gnuradio/digital/symbol_sync_ff.h @@ -44,7 +44,7 @@ class DIGITAL_API symbol_sync_ff : virtual public block { public: // gr::digital::symbol_sync_ff::sptr - typedef boost::shared_ptr<symbol_sync_ff> sptr; + typedef std::shared_ptr<symbol_sync_ff> sptr; /*! * Make a Symbol Synchronizer block. diff --git a/gr-digital/swig/constellation.i b/gr-digital/swig/constellation.i index 4f3746d5fc..8efd20bed7 100644 --- a/gr-digital/swig/constellation.i +++ b/gr-digital/swig/constellation.i @@ -8,63 +8,63 @@ * */ -%template(constellation_sptr) boost::shared_ptr<gr::digital::constellation>; +%template(constellation_sptr) std::shared_ptr<gr::digital::constellation>; -%template(constellation_calcdist_sptr) boost::shared_ptr<gr::digital::constellation_calcdist>; +%template(constellation_calcdist_sptr) std::shared_ptr<gr::digital::constellation_calcdist>; %pythoncode %{ constellation_calcdist_sptr.__repr__ = lambda self: "<constellation calcdist (m=%d)>" % (len(self.points())) constellation_calcdist = constellation_calcdist.make; %} -%template(constellation_rect_sptr) boost::shared_ptr<gr::digital::constellation_rect>; +%template(constellation_rect_sptr) std::shared_ptr<gr::digital::constellation_rect>; %pythoncode %{ constellation_rect_sptr.__repr__ = lambda self: "<constellation rect (m=%d)>" % (len(self.points())) constellation_rect = constellation_rect.make; %} -%template(constellation_expl_rect_sptr) boost::shared_ptr<gr::digital::constellation_expl_rect>; +%template(constellation_expl_rect_sptr) std::shared_ptr<gr::digital::constellation_expl_rect>; %pythoncode %{ constellation_expl_rect_sptr.__repr__ = lambda self: "<constellation expl rect (m=%d)>" % (len(self.points())) constellation_expl_rect = constellation_expl_rect.make; %} -%template(constellation_psk_sptr) boost::shared_ptr<gr::digital::constellation_psk>; +%template(constellation_psk_sptr) std::shared_ptr<gr::digital::constellation_psk>; %pythoncode %{ constellation_psk_sptr.__repr__ = lambda self: "<constellation PSK (m=%d)>" % (len(self.points())) constellation_psk = constellation_psk.make; %} -%template(constellation_bpsk_sptr) boost::shared_ptr<gr::digital::constellation_bpsk>; +%template(constellation_bpsk_sptr) std::shared_ptr<gr::digital::constellation_bpsk>; %pythoncode %{ constellation_bpsk_sptr.__repr__ = lambda self: "<constellation BPSK>" constellation_bpsk = constellation_bpsk.make; %} -%template(constellation_qpsk_sptr) boost::shared_ptr<gr::digital::constellation_qpsk>; +%template(constellation_qpsk_sptr) std::shared_ptr<gr::digital::constellation_qpsk>; %pythoncode %{ constellation_qpsk_sptr.__repr__ = lambda self: "<constellation QPSK>" constellation_qpsk = constellation_qpsk.make; %} -%template(constellation_dqpsk_sptr) boost::shared_ptr<gr::digital::constellation_dqpsk>; +%template(constellation_dqpsk_sptr) std::shared_ptr<gr::digital::constellation_dqpsk>; %pythoncode %{ constellation_dqpsk_sptr.__repr__ = lambda self: "<constellation DQPSK>" constellation_dqpsk = constellation_dqpsk.make; %} -%template(constellation_8psk_sptr) boost::shared_ptr<gr::digital::constellation_8psk>; +%template(constellation_8psk_sptr) std::shared_ptr<gr::digital::constellation_8psk>; %pythoncode %{ constellation_8psk_sptr.__repr__ = lambda self: "<constellation 8PSK>" constellation_8psk = constellation_8psk.make; %} -%template(constellation_8psk_natural_sptr) boost::shared_ptr<gr::digital::constellation_8psk_natural>; +%template(constellation_8psk_natural_sptr) std::shared_ptr<gr::digital::constellation_8psk_natural>; %pythoncode %{ constellation_8psk_natural_sptr.__repr__ = lambda self: "<constellation 8PSK_natural>" constellation_8psk_natural = constellation_8psk_natural.make; %} -%template(constellation_16qam_sptr) boost::shared_ptr<gr::digital::constellation_16qam>; +%template(constellation_16qam_sptr) std::shared_ptr<gr::digital::constellation_16qam>; %pythoncode %{ constellation_16qam_sptr.__repr__ = lambda self: "<constellation 16qam>" constellation_16qam = constellation_16qam.make; diff --git a/gr-digital/swig/ofdm_equalizer.i b/gr-digital/swig/ofdm_equalizer.i index 92775b07fe..f37f4f4342 100644 --- a/gr-digital/swig/ofdm_equalizer.i +++ b/gr-digital/swig/ofdm_equalizer.i @@ -7,13 +7,13 @@ * */ -%template(ofdm_equalizer_base_sptr) boost::shared_ptr<gr::digital::ofdm_equalizer_base>; -%template(ofdm_equalizer_1d_pilots_sptr) boost::shared_ptr<gr::digital::ofdm_equalizer_1d_pilots>; +%template(ofdm_equalizer_base_sptr) std::shared_ptr<gr::digital::ofdm_equalizer_base>; +%template(ofdm_equalizer_1d_pilots_sptr) std::shared_ptr<gr::digital::ofdm_equalizer_1d_pilots>; %pythoncode %{ ofdm_equalizer_1d_pilots_sptr.__repr__ = lambda self: "<OFDM equalizer 1D base class>" %} -%template(ofdm_equalizer_simpledfe_sptr) boost::shared_ptr<gr::digital::ofdm_equalizer_simpledfe>; +%template(ofdm_equalizer_simpledfe_sptr) std::shared_ptr<gr::digital::ofdm_equalizer_simpledfe>; %pythoncode %{ ofdm_equalizer_simpledfe_sptr.__repr__ = lambda self: "<OFDM equalizer simpledfe>" ofdm_equalizer_simpledfe = ofdm_equalizer_simpledfe.make; @@ -21,7 +21,7 @@ ofdm_equalizer_simpledfe = ofdm_equalizer_simpledfe.make; //%rename(ofdm_equalizer_simpledfe) make_ofdm_equalizer_simpledfe; //%ignore ofdm_equalizer_simpledfe; -%template(ofdm_equalizer_static_sptr) boost::shared_ptr<gr::digital::ofdm_equalizer_static>; +%template(ofdm_equalizer_static_sptr) std::shared_ptr<gr::digital::ofdm_equalizer_static>; %pythoncode %{ ofdm_equalizer_static_sptr.__repr__ = lambda self: "<OFDM equalizer static>" ofdm_equalizer_static = ofdm_equalizer_static.make; diff --git a/gr-digital/swig/packet_header.i b/gr-digital/swig/packet_header.i index 15c1eea180..ad226e1fec 100644 --- a/gr-digital/swig/packet_header.i +++ b/gr-digital/swig/packet_header.i @@ -8,40 +8,40 @@ * */ -%template(packet_header_default_sptr) boost::shared_ptr<gr::digital::packet_header_default>; +%template(packet_header_default_sptr) std::shared_ptr<gr::digital::packet_header_default>; %pythoncode %{ packet_header_default_sptr.__repr__ = lambda self: "<packet_header_default>" packet_header_default = packet_header_default .make; %} -%template(packet_header_ofdm_sptr) boost::shared_ptr<gr::digital::packet_header_ofdm>; +%template(packet_header_ofdm_sptr) std::shared_ptr<gr::digital::packet_header_ofdm>; %pythoncode %{ packet_header_ofdm_sptr.__repr__ = lambda self: "<packet_header_ofdm>" packet_header_ofdm = packet_header_ofdm .make; %} -%template(header_format_base_sptr) boost::shared_ptr<gr::digital::header_format_base>; +%template(header_format_base_sptr) std::shared_ptr<gr::digital::header_format_base>; -%template(header_format_default_sptr) boost::shared_ptr<gr::digital::header_format_default>; +%template(header_format_default_sptr) std::shared_ptr<gr::digital::header_format_default>; %pythoncode %{ header_format_default_sptr.__repr__ = lambda self: "<header_format_default>" header_format_default = header_format_default .make; %} -%template(header_format_counter_sptr) boost::shared_ptr<gr::digital::header_format_counter>; +%template(header_format_counter_sptr) std::shared_ptr<gr::digital::header_format_counter>; %pythoncode %{ header_format_counter_sptr.__repr__ = lambda self: "<header_format_counter>" header_format_counter = header_format_counter .make; %} -%template(header_format_crc_sptr) boost::shared_ptr<gr::digital::header_format_crc>; +%template(header_format_crc_sptr) std::shared_ptr<gr::digital::header_format_crc>; %pythoncode %{ header_format_crc_sptr.__repr__ = lambda self: "<header_format_crc>" header_format_crc = header_format_crc .make; %} -%template(header_format_ofdm_sptr) boost::shared_ptr<gr::digital::header_format_ofdm>; +%template(header_format_ofdm_sptr) std::shared_ptr<gr::digital::header_format_ofdm>; %pythoncode %{ header_format_ofdm_sptr.__repr__ = lambda self: "<header_format_ofdm>" header_format_ofdm = header_format_ofdm .make; diff --git a/gr-dtv/include/gnuradio/dtv/atsc_deinterleaver.h b/gr-dtv/include/gnuradio/dtv/atsc_deinterleaver.h index 2f33af91e2..5275dc22ca 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_deinterleaver.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_deinterleaver.h @@ -27,7 +27,7 @@ class DTV_API atsc_deinterleaver : virtual public gr::sync_block { public: // gr::dtv::atsc_deinterleaver::sptr - typedef boost::shared_ptr<atsc_deinterleaver> sptr; + typedef std::shared_ptr<atsc_deinterleaver> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_deinterleaver. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_depad.h b/gr-dtv/include/gnuradio/dtv/atsc_depad.h index 293752269c..b6d54bc429 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_depad.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_depad.h @@ -27,7 +27,7 @@ class DTV_API atsc_depad : virtual public gr::sync_interpolator { public: // gr::dtv::atsc_depad::sptr - typedef boost::shared_ptr<atsc_depad> sptr; + typedef std::shared_ptr<atsc_depad> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_depad. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_derandomizer.h b/gr-dtv/include/gnuradio/dtv/atsc_derandomizer.h index b149d0cf8d..22292597e3 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_derandomizer.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_derandomizer.h @@ -27,7 +27,7 @@ class DTV_API atsc_derandomizer : virtual public gr::sync_block { public: // gr::dtv::atsc_derandomizer::sptr - typedef boost::shared_ptr<atsc_derandomizer> sptr; + typedef std::shared_ptr<atsc_derandomizer> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_derandomizer. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h index aeb0bc374b..9ae2487e91 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_equalizer.h @@ -26,7 +26,7 @@ class DTV_API atsc_equalizer : virtual public gr::block { public: // gr::dtv::atsc_equalizer::sptr - typedef boost::shared_ptr<atsc_equalizer> sptr; + typedef std::shared_ptr<atsc_equalizer> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_equalizer. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h b/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h index 300d4ee926..9f49e4aa90 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h @@ -23,7 +23,7 @@ namespace dtv { class DTV_API atsc_field_sync_mux : virtual public gr::block { public: - typedef boost::shared_ptr<atsc_field_sync_mux> sptr; + typedef std::shared_ptr<atsc_field_sync_mux> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_field_sync_mux. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_fpll.h b/gr-dtv/include/gnuradio/dtv/atsc_fpll.h index a877222131..9e4b141911 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_fpll.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_fpll.h @@ -41,7 +41,7 @@ class DTV_API atsc_fpll : virtual public gr::sync_block { public: // gr::dtv::atsc_fpll::sptr - typedef boost::shared_ptr<atsc_fpll> sptr; + typedef std::shared_ptr<atsc_fpll> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_fpll. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h b/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h index acd97b7686..6f5454d716 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_fs_checker.h @@ -26,7 +26,7 @@ class DTV_API atsc_fs_checker : virtual public gr::block { public: // gr::dtv::atsc_fs_checker::sptr - typedef boost::shared_ptr<atsc_fs_checker> sptr; + typedef std::shared_ptr<atsc_fs_checker> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_fs_checker. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_interleaver.h b/gr-dtv/include/gnuradio/dtv/atsc_interleaver.h index 0555f8acca..2d0ed5f911 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_interleaver.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_interleaver.h @@ -23,7 +23,7 @@ namespace dtv { class DTV_API atsc_interleaver : virtual public gr::sync_block { public: - typedef boost::shared_ptr<atsc_interleaver> sptr; + typedef std::shared_ptr<atsc_interleaver> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_pad.h b/gr-dtv/include/gnuradio/dtv/atsc_pad.h index c9249f49a9..e145e76c83 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_pad.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_pad.h @@ -23,7 +23,7 @@ namespace dtv { class DTV_API atsc_pad : virtual public gr::sync_decimator { public: - typedef boost::shared_ptr<atsc_pad> sptr; + typedef std::shared_ptr<atsc_pad> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_pad. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_randomizer.h b/gr-dtv/include/gnuradio/dtv/atsc_randomizer.h index 19a778864b..323c50b383 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_randomizer.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_randomizer.h @@ -24,7 +24,7 @@ namespace dtv { class DTV_API atsc_randomizer : virtual public gr::sync_block { public: - typedef boost::shared_ptr<atsc_randomizer> sptr; + typedef std::shared_ptr<atsc_randomizer> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_randomizer. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h b/gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h index b856d94928..f054ddded9 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h @@ -26,7 +26,7 @@ class DTV_API atsc_rs_decoder : virtual public gr::sync_block { public: // gr::dtv::atsc_rs_decoder::sptr - typedef boost::shared_ptr<atsc_rs_decoder> sptr; + typedef std::shared_ptr<atsc_rs_decoder> sptr; /*! * Returns the number of errors corrected by the decoder. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_rs_encoder.h b/gr-dtv/include/gnuradio/dtv/atsc_rs_encoder.h index eda7d56427..3318524194 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_rs_encoder.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_rs_encoder.h @@ -24,7 +24,7 @@ namespace dtv { class DTV_API atsc_rs_encoder : virtual public gr::sync_block { public: - typedef boost::shared_ptr<atsc_rs_encoder> sptr; + typedef std::shared_ptr<atsc_rs_encoder> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_rs_encoder. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_sync.h b/gr-dtv/include/gnuradio/dtv/atsc_sync.h index 3199728929..25bedd54b8 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_sync.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_sync.h @@ -26,7 +26,7 @@ class DTV_API atsc_sync : virtual public gr::block { public: // gr::dtv::atsc_sync::sptr - typedef boost::shared_ptr<atsc_sync> sptr; + typedef std::shared_ptr<atsc_sync> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_sync. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_trellis_encoder.h b/gr-dtv/include/gnuradio/dtv/atsc_trellis_encoder.h index d774a17eec..af39dae41d 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_trellis_encoder.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_trellis_encoder.h @@ -23,7 +23,7 @@ namespace dtv { class DTV_API atsc_trellis_encoder : virtual public gr::sync_block { public: - typedef boost::shared_ptr<atsc_trellis_encoder> sptr; + typedef std::shared_ptr<atsc_trellis_encoder> sptr; /*! * \brief Return a shared_ptr to a new instance of dtv::atsc_trellis_encoder. diff --git a/gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h b/gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h index 1c9963ee46..6060cca8e7 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h @@ -26,7 +26,7 @@ class DTV_API atsc_viterbi_decoder : virtual public gr::sync_block { public: // gr::dtv::atsc_viterbi_decoder::sptr - typedef boost::shared_ptr<atsc_viterbi_decoder> sptr; + typedef std::shared_ptr<atsc_viterbi_decoder> sptr; /*! * \brief Make a new instance of gr::dtv::atsc_viterbi_decoder. diff --git a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h index 3e74c96ee2..dba63791e3 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API catv_frame_sync_enc_bb : virtual public gr::block { public: - typedef boost::shared_ptr<catv_frame_sync_enc_bb> sptr; + typedef std::shared_ptr<catv_frame_sync_enc_bb> sptr; /*! * \brief Create an ITU-T J.83B Frame Sync Encoder. diff --git a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h index 764675e05a..9f3155b7c8 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API catv_randomizer_bb : virtual public gr::sync_block { public: - typedef boost::shared_ptr<catv_randomizer_bb> sptr; + typedef std::shared_ptr<catv_randomizer_bb> sptr; /*! * \brief Create an ITU-T J.83B randomizer. diff --git a/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h index ea5261d3b1..bc5cffd583 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_reed_solomon_enc_bb.h @@ -25,7 +25,7 @@ namespace dtv { class DTV_API catv_reed_solomon_enc_bb : virtual public gr::block { public: - typedef boost::shared_ptr<catv_reed_solomon_enc_bb> sptr; + typedef std::shared_ptr<catv_reed_solomon_enc_bb> sptr; /*! * \brief Create an ITU-T J.83B Reed Solomon encoder. diff --git a/gr-dtv/include/gnuradio/dtv/catv_transport_framing_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_transport_framing_enc_bb.h index 301bb58c11..73b99d7bfe 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_transport_framing_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_transport_framing_enc_bb.h @@ -25,7 +25,7 @@ namespace dtv { class DTV_API catv_transport_framing_enc_bb : virtual public gr::sync_block { public: - typedef boost::shared_ptr<catv_transport_framing_enc_bb> sptr; + typedef std::shared_ptr<catv_transport_framing_enc_bb> sptr; /*! * \brief Create an ITU-T J.83B Transport Framing Encoder. diff --git a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h index de30e1d9af..eeb96f6645 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h @@ -28,7 +28,7 @@ namespace dtv { class DTV_API catv_trellis_enc_bb : virtual public gr::block { public: - typedef boost::shared_ptr<catv_trellis_enc_bb> sptr; + typedef std::shared_ptr<catv_trellis_enc_bb> sptr; /*! * \brief Create an ITU-T J.83B Trellis Encoder. diff --git a/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h index b0a9619781..372c3263b3 100644 --- a/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvb_bbheader_bb.h @@ -31,7 +31,7 @@ namespace dtv { class DTV_API dvb_bbheader_bb : virtual public gr::block { public: - typedef boost::shared_ptr<dvb_bbheader_bb> sptr; + typedef std::shared_ptr<dvb_bbheader_bb> sptr; /*! * \brief Create a baseband header formatter. diff --git a/gr-dtv/include/gnuradio/dtv/dvb_bbscrambler_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_bbscrambler_bb.h index 177a424e2e..756c90ad0c 100644 --- a/gr-dtv/include/gnuradio/dtv/dvb_bbscrambler_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvb_bbscrambler_bb.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvb_bbscrambler_bb : virtual public gr::sync_block { public: - typedef boost::shared_ptr<dvb_bbscrambler_bb> sptr; + typedef std::shared_ptr<dvb_bbscrambler_bb> sptr; /*! * \brief Create a baseband frame scrambler. diff --git a/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h index a67731fecf..fba8ed2792 100644 --- a/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvb_bch_bb.h @@ -28,7 +28,7 @@ namespace dtv { class DTV_API dvb_bch_bb : virtual public gr::block { public: - typedef boost::shared_ptr<dvb_bch_bb> sptr; + typedef std::shared_ptr<dvb_bch_bb> sptr; /*! * \brief Create a baseband frame BCH encoder. diff --git a/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h b/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h index 4498c42cc7..c087ba764c 100644 --- a/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvb_ldpc_bb.h @@ -26,7 +26,7 @@ namespace dtv { class DTV_API dvb_ldpc_bb : virtual public gr::block { public: - typedef boost::shared_ptr<dvb_ldpc_bb> sptr; + typedef std::shared_ptr<dvb_ldpc_bb> sptr; /*! * \brief Create a baseband frame LDPC encoder. diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h b/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h index 0754299aae..73dab1bfae 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h @@ -26,7 +26,7 @@ namespace dtv { class DTV_API dvbs2_interleaver_bb : virtual public gr::block { public: - typedef boost::shared_ptr<dvbs2_interleaver_bb> sptr; + typedef std::shared_ptr<dvbs2_interleaver_bb> sptr; /*! * \brief Create a DVB-S2 bit interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h b/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h index 7175c29922..bd26bada99 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbs2_modulator_bc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbs2_modulator_bc> sptr; + typedef std::shared_ptr<dvbs2_modulator_bc> sptr; /*! * \brief Create a DVB-S2 constellation modulator. diff --git a/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h b/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h index fb705320f1..07daab415c 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbs2_physical_cc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbs2_physical_cc> sptr; + typedef std::shared_ptr<dvbs2_physical_cc> sptr; /*! * \brief Create a DVB-S2 physical layer framer. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_cellinterleaver_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_cellinterleaver_cc.h index 33fa6450c8..2e4f3ad229 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_cellinterleaver_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_cellinterleaver_cc.h @@ -26,7 +26,7 @@ namespace dtv { class DTV_API dvbt2_cellinterleaver_cc : virtual public gr::sync_block { public: - typedef boost::shared_ptr<dvbt2_cellinterleaver_cc> sptr; + typedef std::shared_ptr<dvbt2_cellinterleaver_cc> sptr; /*! * \brief Create a DVB-T2 cell and time interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h index edb9e6c655..2746e27b3c 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_framemapper_cc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt2_framemapper_cc> sptr; + typedef std::shared_ptr<dvbt2_framemapper_cc> sptr; /*! * \brief Create a DVB-T2 frame mapper. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h index 00b29d3d6d..c3f872d15f 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_freqinterleaver_cc : virtual public gr::sync_block { public: - typedef boost::shared_ptr<dvbt2_freqinterleaver_cc> sptr; + typedef std::shared_ptr<dvbt2_freqinterleaver_cc> sptr; /*! * \brief Create a DVB-T2 frequency interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h b/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h index 2b27f221fe..aac3464dcc 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_interleaver_bb.h @@ -26,7 +26,7 @@ namespace dtv { class DTV_API dvbt2_interleaver_bb : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt2_interleaver_bb> sptr; + typedef std::shared_ptr<dvbt2_interleaver_bb> sptr; /*! * \brief Create a DVB-T2 bit interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h index b05361c732..4aa7685a82 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h @@ -28,7 +28,7 @@ namespace dtv { class DTV_API dvbt2_miso_cc : virtual public gr::sync_block { public: - typedef boost::shared_ptr<dvbt2_miso_cc> sptr; + typedef std::shared_ptr<dvbt2_miso_cc> sptr; /*! * \brief Create a MISO processor. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h index 87e3f7c6fd..7e91c997e0 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_modulator_bc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_modulator_bc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt2_modulator_bc> sptr; + typedef std::shared_ptr<dvbt2_modulator_bc> sptr; /*! * \brief Create a DVB-T2 constellation modulator. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h index c76578181b..637e4d102a 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_p1insertion_cc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt2_p1insertion_cc> sptr; + typedef std::shared_ptr<dvbt2_p1insertion_cc> sptr; /*! * \brief Create a P1 symbol inserter. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h index 0b1fc569b9..6bebae7acb 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_paprtr_cc : virtual public gr::sync_block { public: - typedef boost::shared_ptr<dvbt2_paprtr_cc> sptr; + typedef std::shared_ptr<dvbt2_paprtr_cc> sptr; /*! * \brief Create a PAPR reducer. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h index 8d3231e14a..ce954665ce 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt2_pilotgenerator_cc : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt2_pilotgenerator_cc> sptr; + typedef std::shared_ptr<dvbt2_pilotgenerator_cc> sptr; /*! * \brief Create a DVB-T2 pilot generator. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h index 303d498dda..f5f5d437a5 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h @@ -35,7 +35,7 @@ namespace dtv { class DTV_API dvbt_bit_inner_deinterleaver : virtual public block { public: - typedef boost::shared_ptr<dvbt_bit_inner_deinterleaver> sptr; + typedef std::shared_ptr<dvbt_bit_inner_deinterleaver> sptr; /*! * \brief Create a Bit Inner deinterleaver diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h index 31e0f79fe2..d4e8367d8a 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_bit_inner_interleaver.h @@ -35,7 +35,7 @@ namespace dtv { class DTV_API dvbt_bit_inner_interleaver : virtual public block { public: - typedef boost::shared_ptr<dvbt_bit_inner_interleaver> sptr; + typedef std::shared_ptr<dvbt_bit_inner_interleaver> sptr; /*! * \brief Create a Bit Inner interleaver diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h index 5ee380e262..8cc5b18ba1 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt_convolutional_deinterleaver : virtual public block { public: - typedef boost::shared_ptr<dvbt_convolutional_deinterleaver> sptr; + typedef std::shared_ptr<dvbt_convolutional_deinterleaver> sptr; /*! * \brief Create a DVB-T convolutional deinterleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_interleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_interleaver.h index 163156712e..aaed3d0ed3 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_interleaver.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_convolutional_interleaver.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt_convolutional_interleaver : virtual public sync_interpolator { public: - typedef boost::shared_ptr<dvbt_convolutional_interleaver> sptr; + typedef std::shared_ptr<dvbt_convolutional_interleaver> sptr; /*! * \brief Create a DVB-T convolutional interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_demap.h b/gr-dtv/include/gnuradio/dtv/dvbt_demap.h index 7683b13ca6..b7667d1c4f 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_demap.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_demap.h @@ -32,7 +32,7 @@ namespace dtv { class DTV_API dvbt_demap : virtual public block { public: - typedef boost::shared_ptr<dvbt_demap> sptr; + typedef std::shared_ptr<dvbt_demap> sptr; /*! * \brief Create a DVB-T demapper. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h b/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h index bcfa5673b0..e105818ee1 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_demod_reference_signals.h @@ -30,7 +30,7 @@ namespace dtv { class DTV_API dvbt_demod_reference_signals : virtual public block { public: - typedef boost::shared_ptr<dvbt_demod_reference_signals> sptr; + typedef std::shared_ptr<dvbt_demod_reference_signals> sptr; /*! * \brief Create Reference signals demodulator. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h b/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h index 2a113f0849..a8baba4a21 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_energy_descramble.h @@ -29,7 +29,7 @@ namespace dtv { class DTV_API dvbt_energy_descramble : virtual public block { public: - typedef boost::shared_ptr<dvbt_energy_descramble> sptr; + typedef std::shared_ptr<dvbt_energy_descramble> sptr; /*! * \brief Create DVB-T Energy descramble. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h b/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h index 0ef8b39187..6b28bef078 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_energy_dispersal.h @@ -29,7 +29,7 @@ namespace dtv { class DTV_API dvbt_energy_dispersal : virtual public gr::block { public: - typedef boost::shared_ptr<dvbt_energy_dispersal> sptr; + typedef std::shared_ptr<dvbt_energy_dispersal> sptr; /*! * \brief Create DVB-T energy dispersal. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h b/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h index bc2bbbaeec..e61dea6570 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h @@ -36,7 +36,7 @@ namespace dtv { class DTV_API dvbt_inner_coder : virtual public block { public: - typedef boost::shared_ptr<dvbt_inner_coder> sptr; + typedef std::shared_ptr<dvbt_inner_coder> sptr; /*! * \brief Create an Inner coder with Puncturing. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_map.h b/gr-dtv/include/gnuradio/dtv/dvbt_map.h index 9322b877d5..bbe4bee87a 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_map.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_map.h @@ -32,7 +32,7 @@ namespace dtv { class DTV_API dvbt_map : virtual public block { public: - typedef boost::shared_ptr<dvbt_map> sptr; + typedef std::shared_ptr<dvbt_map> sptr; /*! * \brief Create a DVB-T mapper. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h b/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h index 106993f9fe..14d675e87c 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_ofdm_sym_acquisition.h @@ -27,7 +27,7 @@ namespace dtv { class DTV_API dvbt_ofdm_sym_acquisition : virtual public block { public: - typedef boost::shared_ptr<dvbt_ofdm_sym_acquisition> sptr; + typedef std::shared_ptr<dvbt_ofdm_sym_acquisition> sptr; /*! * \brief Create OFDM symbol acquisition. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h index 536ff74ac7..5405909d08 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_dec.h @@ -25,7 +25,7 @@ namespace dtv { class DTV_API dvbt_reed_solomon_dec : virtual public block { public: - typedef boost::shared_ptr<dvbt_reed_solomon_dec> sptr; + typedef std::shared_ptr<dvbt_reed_solomon_dec> sptr; /*! * \brief Create a Reed Solomon decoder. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h index a2613e447d..07e3727d04 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_reed_solomon_enc.h @@ -25,7 +25,7 @@ namespace dtv { class DTV_API dvbt_reed_solomon_enc : virtual public block { public: - typedef boost::shared_ptr<dvbt_reed_solomon_enc> sptr; + typedef std::shared_ptr<dvbt_reed_solomon_enc> sptr; /*! * \brief Create a Reed Solomon encoder. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h b/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h index d0752774fe..fc1b468901 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_reference_signals.h @@ -30,7 +30,7 @@ namespace dtv { class DTV_API dvbt_reference_signals : virtual public block { public: - typedef boost::shared_ptr<dvbt_reference_signals> sptr; + typedef std::shared_ptr<dvbt_reference_signals> sptr; /*! * \brief Create Reference signals generator. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h b/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h index bee84e3ec9..995deed3a9 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h @@ -35,7 +35,7 @@ namespace dtv { class DTV_API dvbt_symbol_inner_interleaver : virtual public block { public: - typedef boost::shared_ptr<dvbt_symbol_inner_interleaver> sptr; + typedef std::shared_ptr<dvbt_symbol_inner_interleaver> sptr; /*! * \brief Create a Symbol interleaver. diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h b/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h index c487ae6d6f..9162c8114e 100644 --- a/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h +++ b/gr-dtv/include/gnuradio/dtv/dvbt_viterbi_decoder.h @@ -36,7 +36,7 @@ namespace dtv { class DTV_API dvbt_viterbi_decoder : virtual public block { public: - typedef boost::shared_ptr<dvbt_viterbi_decoder> sptr; + typedef std::shared_ptr<dvbt_viterbi_decoder> sptr; /*! * \brief Create a DVB-T Viterbi decoder. diff --git a/gr-fec/include/gnuradio/fec/async_decoder.h b/gr-fec/include/gnuradio/fec/async_decoder.h index 7530a72b1e..d1274a0ed6 100644 --- a/gr-fec/include/gnuradio/fec/async_decoder.h +++ b/gr-fec/include/gnuradio/fec/async_decoder.h @@ -14,7 +14,7 @@ #include <gnuradio/block.h> #include <gnuradio/fec/api.h> #include <gnuradio/fec/generic_decoder.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -67,7 +67,7 @@ namespace fec { class FEC_API async_decoder : virtual public block { public: - typedef boost::shared_ptr<async_decoder> sptr; + typedef std::shared_ptr<async_decoder> sptr; /*! * Build the PDU-based FEC decoder block from an FECAPI decoder object. diff --git a/gr-fec/include/gnuradio/fec/async_encoder.h b/gr-fec/include/gnuradio/fec/async_encoder.h index 9eb2deccc9..4a4ea67e8c 100644 --- a/gr-fec/include/gnuradio/fec/async_encoder.h +++ b/gr-fec/include/gnuradio/fec/async_encoder.h @@ -14,7 +14,7 @@ #include <gnuradio/block.h> #include <gnuradio/fec/api.h> #include <gnuradio/fec/generic_encoder.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -61,7 +61,7 @@ namespace fec { class FEC_API async_encoder : virtual public block { public: - typedef boost::shared_ptr<async_encoder> sptr; + typedef std::shared_ptr<async_encoder> sptr; /*! * Build the PDU-based FEC encoder block from an FECAPI encoder object. diff --git a/gr-fec/include/gnuradio/fec/ber_bf.h b/gr-fec/include/gnuradio/fec/ber_bf.h index 1879f18d4d..2fa97c4dd4 100644 --- a/gr-fec/include/gnuradio/fec/ber_bf.h +++ b/gr-fec/include/gnuradio/fec/ber_bf.h @@ -52,7 +52,7 @@ class FEC_API ber_bf : virtual public block { public: // gr::fec::ber_bf::sptr - typedef boost::shared_ptr<ber_bf> sptr; + typedef std::shared_ptr<ber_bf> sptr; /*! * Get total number of errors counter value. diff --git a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h index ecc653b595..68ce7dd5ae 100644 --- a/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h +++ b/gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h @@ -30,7 +30,7 @@ class FEC_API conv_bit_corr_bb : virtual public block { public: // gr::fec::conv_bit_corr_bb::sptr - typedef boost::shared_ptr<conv_bit_corr_bb> sptr; + typedef std::shared_ptr<conv_bit_corr_bb> sptr; static sptr make(std::vector<unsigned long long> correlator, int corr_sym, diff --git a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h index 4130488da8..1569baea0c 100644 --- a/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h +++ b/gr-fec/include/gnuradio/fec/decode_ccsds_27_fb.h @@ -41,7 +41,7 @@ class FEC_API decode_ccsds_27_fb : virtual public sync_decimator { public: // gr::fec::decode_ccsds_27_fb::sptr - typedef boost::shared_ptr<decode_ccsds_27_fb> sptr; + typedef std::shared_ptr<decode_ccsds_27_fb> sptr; static sptr make(); }; diff --git a/gr-fec/include/gnuradio/fec/decoder.h b/gr-fec/include/gnuradio/fec/decoder.h index eb4a208fb7..4a551934a5 100644 --- a/gr-fec/include/gnuradio/fec/decoder.h +++ b/gr-fec/include/gnuradio/fec/decoder.h @@ -16,7 +16,7 @@ #include <gnuradio/fec/generic_decoder.h> #include <boost/format.hpp> #include <boost/shared_array.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -54,7 +54,7 @@ namespace fec { class FEC_API decoder : virtual public block { public: - typedef boost::shared_ptr<decoder> sptr; + typedef std::shared_ptr<decoder> sptr; typedef boost::shared_array<unsigned char> buf_sptr; /*! diff --git a/gr-fec/include/gnuradio/fec/depuncture_bb.h b/gr-fec/include/gnuradio/fec/depuncture_bb.h index 60e784e2df..8157487a04 100644 --- a/gr-fec/include/gnuradio/fec/depuncture_bb.h +++ b/gr-fec/include/gnuradio/fec/depuncture_bb.h @@ -79,7 +79,7 @@ class FEC_API depuncture_bb : virtual public block { public: // gr::fec::depuncture_bb::sptr - typedef boost::shared_ptr<depuncture_bb> sptr; + typedef std::shared_ptr<depuncture_bb> sptr; /*! * \brief Constructs a depuncture block. diff --git a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h index b8eb063f03..bd5ff91c78 100644 --- a/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h +++ b/gr-fec/include/gnuradio/fec/encode_ccsds_27_bb.h @@ -38,7 +38,7 @@ class FEC_API encode_ccsds_27_bb : virtual public sync_interpolator { public: // gr::fec::encode_ccsds_27_bb::sptr - typedef boost::shared_ptr<encode_ccsds_27_bb> sptr; + typedef std::shared_ptr<encode_ccsds_27_bb> sptr; static sptr make(); }; diff --git a/gr-fec/include/gnuradio/fec/encoder.h b/gr-fec/include/gnuradio/fec/encoder.h index f294dccc9e..a79ba0876c 100644 --- a/gr-fec/include/gnuradio/fec/encoder.h +++ b/gr-fec/include/gnuradio/fec/encoder.h @@ -14,7 +14,7 @@ #include <gnuradio/block.h> #include <gnuradio/fec/api.h> #include <gnuradio/fec/generic_encoder.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -35,7 +35,7 @@ namespace fec { class FEC_API encoder : virtual public block { public: - typedef boost::shared_ptr<encoder> sptr; + typedef std::shared_ptr<encoder> sptr; /*! * Build the FEC encoder block from an FECAPI encoder object. diff --git a/gr-fec/include/gnuradio/fec/fec_mtrx.h b/gr-fec/include/gnuradio/fec/fec_mtrx.h index 6ea05f12a6..8a0a93f469 100644 --- a/gr-fec/include/gnuradio/fec/fec_mtrx.h +++ b/gr-fec/include/gnuradio/fec/fec_mtrx.h @@ -10,8 +10,8 @@ #define INCLUDED_fec_mtrx_H #include <gnuradio/fec/api.h> -#include <boost/shared_ptr.hpp> #include <cstdlib> +#include <memory> namespace gr { namespace fec { @@ -33,10 +33,10 @@ typedef struct { FEC_API void matrix_free(matrix* x); -typedef boost::shared_ptr<matrix> matrix_sptr; +typedef std::shared_ptr<matrix> matrix_sptr; class fec_mtrx; -typedef boost::shared_ptr<fec_mtrx> fec_mtrx_sptr; +typedef std::shared_ptr<fec_mtrx> fec_mtrx_sptr; /*! * \brief Read in an alist file and produce the matrix object. diff --git a/gr-fec/include/gnuradio/fec/generic_decoder.h b/gr-fec/include/gnuradio/fec/generic_decoder.h index 8b2fa7a9b6..e4f674b103 100644 --- a/gr-fec/include/gnuradio/fec/generic_decoder.h +++ b/gr-fec/include/gnuradio/fec/generic_decoder.h @@ -14,7 +14,7 @@ #include <gnuradio/fec/api.h> #include <gnuradio/logger.h> #include <boost/format.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -60,7 +60,7 @@ public: std::string alias() { return (boost::format("%s%d") % d_name % unique_id()).str(); } public: - typedef boost::shared_ptr<generic_decoder> sptr; + typedef std::shared_ptr<generic_decoder> sptr; generic_decoder(void){}; generic_decoder(std::string name); diff --git a/gr-fec/include/gnuradio/fec/generic_encoder.h b/gr-fec/include/gnuradio/fec/generic_encoder.h index a2af523d29..ce8b6ec6f5 100644 --- a/gr-fec/include/gnuradio/fec/generic_encoder.h +++ b/gr-fec/include/gnuradio/fec/generic_encoder.h @@ -14,7 +14,7 @@ #include <gnuradio/block.h> #include <gnuradio/fec/api.h> #include <gnuradio/logger.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -34,7 +34,7 @@ public: std::string alias() { return (boost::format("%s%d") % d_name % unique_id()).str(); } public: - typedef boost::shared_ptr<generic_encoder> sptr; + typedef std::shared_ptr<generic_encoder> sptr; /*! * Returns the rate of the code. For every 1 input bit, there diff --git a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h index 4f291fd37d..7910dc3a14 100644 --- a/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h +++ b/gr-fec/include/gnuradio/fec/ldpc_G_matrix.h @@ -11,8 +11,7 @@ #include <gnuradio/fec/api.h> #include <gnuradio/fec/fec_mtrx.h> -#include <boost/enable_shared_from_this.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -40,10 +39,10 @@ namespace code { * ldpc_bit_flip_decoder classes. */ class FEC_API ldpc_G_matrix : virtual public fec_mtrx, - public boost::enable_shared_from_this<ldpc_G_matrix> + public std::enable_shared_from_this<ldpc_G_matrix> { public: - typedef boost::shared_ptr<ldpc_G_matrix> sptr; + typedef std::shared_ptr<ldpc_G_matrix> sptr; /*! * \brief Constructor given alist file diff --git a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h index 19691bb7e0..9a3628a529 100644 --- a/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h +++ b/gr-fec/include/gnuradio/fec/ldpc_H_matrix.h @@ -11,8 +11,7 @@ #include <gnuradio/fec/api.h> #include <gnuradio/fec/fec_mtrx.h> -#include <boost/enable_shared_from_this.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -35,10 +34,10 @@ namespace code { * /lib/python2.7/dist-packages/gnuradio/fec/LDPC/Generate_LDPC_matrix.py. */ class FEC_API ldpc_H_matrix : virtual public fec_mtrx, - public boost::enable_shared_from_this<ldpc_H_matrix> + public std::enable_shared_from_this<ldpc_H_matrix> { public: - typedef boost::shared_ptr<ldpc_H_matrix> sptr; + typedef std::shared_ptr<ldpc_H_matrix> sptr; /*! * \brief Constructor given alist file and gap diff --git a/gr-fec/include/gnuradio/fec/puncture_bb.h b/gr-fec/include/gnuradio/fec/puncture_bb.h index a6f49d2b28..1be163c7ea 100644 --- a/gr-fec/include/gnuradio/fec/puncture_bb.h +++ b/gr-fec/include/gnuradio/fec/puncture_bb.h @@ -78,7 +78,7 @@ class FEC_API puncture_bb : virtual public block { public: // gr::fec::puncture_bb::sptr - typedef boost::shared_ptr<puncture_bb> sptr; + typedef std::shared_ptr<puncture_bb> sptr; /*! * \brief Constructs a puncture block for unpacked bits. diff --git a/gr-fec/include/gnuradio/fec/puncture_ff.h b/gr-fec/include/gnuradio/fec/puncture_ff.h index d453b9feee..d9adbef33d 100644 --- a/gr-fec/include/gnuradio/fec/puncture_ff.h +++ b/gr-fec/include/gnuradio/fec/puncture_ff.h @@ -77,7 +77,7 @@ class FEC_API puncture_ff : virtual public block { public: // gr::fec::puncture_ff::sptr - typedef boost::shared_ptr<puncture_ff> sptr; + typedef std::shared_ptr<puncture_ff> sptr; /*! * \brief Constructs a puncture block for floats. diff --git a/gr-fec/include/gnuradio/fec/tagged_decoder.h b/gr-fec/include/gnuradio/fec/tagged_decoder.h index bf089d8e98..6f2fc08ea1 100644 --- a/gr-fec/include/gnuradio/fec/tagged_decoder.h +++ b/gr-fec/include/gnuradio/fec/tagged_decoder.h @@ -15,7 +15,7 @@ #include <gnuradio/fec/generic_decoder.h> #include <gnuradio/tagged_stream_block.h> #include <boost/shared_array.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -53,7 +53,7 @@ namespace fec { class FEC_API tagged_decoder : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<tagged_decoder> sptr; + typedef std::shared_ptr<tagged_decoder> sptr; typedef boost::shared_array<unsigned char> buf_sptr; /*! diff --git a/gr-fec/include/gnuradio/fec/tagged_encoder.h b/gr-fec/include/gnuradio/fec/tagged_encoder.h index 5019bd04a1..9e6dab49e5 100644 --- a/gr-fec/include/gnuradio/fec/tagged_encoder.h +++ b/gr-fec/include/gnuradio/fec/tagged_encoder.h @@ -14,7 +14,7 @@ #include <gnuradio/fec/api.h> #include <gnuradio/fec/generic_encoder.h> #include <gnuradio/tagged_stream_block.h> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace fec { @@ -35,7 +35,7 @@ namespace fec { class FEC_API tagged_encoder : virtual public tagged_stream_block { public: - typedef boost::shared_ptr<tagged_encoder> sptr; + typedef std::shared_ptr<tagged_encoder> sptr; /*! * Build the FEC encoder block from an FECAPI encoder object. diff --git a/gr-fec/lib/fec_mtrx_impl.cc b/gr-fec/lib/fec_mtrx_impl.cc index 3f05f9e6d6..b08ee05fec 100644 --- a/gr-fec/lib/fec_mtrx_impl.cc +++ b/gr-fec/lib/fec_mtrx_impl.cc @@ -12,6 +12,7 @@ #include "fec_mtrx_impl.h" #include <math.h> +#include <algorithm> #include <fstream> #include <iostream> #include <sstream> diff --git a/gr-fec/swig/fec_swig.i b/gr-fec/swig/fec_swig.i index 8ef80e6d51..1d195ca280 100644 --- a/gr-fec/swig/fec_swig.i +++ b/gr-fec/swig/fec_swig.i @@ -18,10 +18,10 @@ %include "gnuradio/fec/cc_common.h" %nodefaultctor gr::fec::generic_encoder; -%template(generic_encoder_sptr) boost::shared_ptr<gr::fec::generic_encoder>; +%template(generic_encoder_sptr) std::shared_ptr<gr::fec::generic_encoder>; %nodefaultctor gr::fec::generic_decoder; -%template(generic_decoder_sptr) boost::shared_ptr<gr::fec::generic_decoder>; +%template(generic_decoder_sptr) std::shared_ptr<gr::fec::generic_decoder>; %{ #include "gnuradio/fec/generic_decoder.h" diff --git a/gr-fec/swig/ldpc.i b/gr-fec/swig/ldpc.i index d283d9b93a..e7f6eafaf0 100644 --- a/gr-fec/swig/ldpc.i +++ b/gr-fec/swig/ldpc.i @@ -8,15 +8,15 @@ * */ -%template(matrix_sptr) boost::shared_ptr<gr::fec::code::matrix>; -%template(fec_mtrx_sptr) boost::shared_ptr<gr::fec::code::fec_mtrx>; +%template(matrix_sptr) std::shared_ptr<gr::fec::code::matrix>; +%template(fec_mtrx_sptr) std::shared_ptr<gr::fec::code::fec_mtrx>; -%template(ldpc_H_matrix_sptr) boost::shared_ptr<gr::fec::code::ldpc_H_matrix>; +%template(ldpc_H_matrix_sptr) std::shared_ptr<gr::fec::code::ldpc_H_matrix>; %pythoncode %{ ldpc_H_matrix = ldpc_H_matrix.make; %} -%template(ldpc_G_matrix_sptr) boost::shared_ptr<gr::fec::code::ldpc_G_matrix>; +%template(ldpc_G_matrix_sptr) std::shared_ptr<gr::fec::code::ldpc_G_matrix>; %pythoncode %{ ldpc_G_matrix = ldpc_G_matrix.make; %} diff --git a/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h b/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h index 9f041a3a93..6238046918 100644 --- a/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h +++ b/gr-fft/include/gnuradio/fft/ctrlport_probe_psd.h @@ -31,7 +31,7 @@ namespace fft { class FFT_API ctrlport_probe_psd : virtual public gr::sync_block { public: - typedef boost::shared_ptr<ctrlport_probe_psd> sptr; + typedef std::shared_ptr<ctrlport_probe_psd> sptr; /*! * \brief Make a ControlPort probe block. diff --git a/gr-fft/include/gnuradio/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h index eb2ac2f81f..95d1f18553 100644 --- a/gr-fft/include/gnuradio/fft/fft_vcc.h +++ b/gr-fft/include/gnuradio/fft/fft_vcc.h @@ -48,7 +48,7 @@ class FFT_API fft_vcc : virtual public sync_block { public: // gr::fft::fft_vcc::sptr - typedef boost::shared_ptr<fft_vcc> sptr; + typedef std::shared_ptr<fft_vcc> sptr; /*! \brief * \param[in] fft_size N. * \param[in] forward True performs FFT, False performs IFFT. diff --git a/gr-fft/include/gnuradio/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h index f9a10797ae..21859abe17 100644 --- a/gr-fft/include/gnuradio/fft/fft_vfc.h +++ b/gr-fft/include/gnuradio/fft/fft_vfc.h @@ -48,7 +48,7 @@ class FFT_API fft_vfc : virtual public sync_block { public: // gr::fft::fft_vfc::sptr - typedef boost::shared_ptr<fft_vfc> sptr; + typedef std::shared_ptr<fft_vfc> sptr; /*! \brief * \param[in] fft_size N. diff --git a/gr-fft/include/gnuradio/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h index 46e655facf..f3ff011a07 100644 --- a/gr-fft/include/gnuradio/fft/goertzel_fc.h +++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h @@ -25,7 +25,7 @@ class FFT_API goertzel_fc : virtual public sync_decimator { public: // gr::fft::goertzel_fc::sptr - typedef boost::shared_ptr<goertzel_fc> sptr; + typedef std::shared_ptr<goertzel_fc> sptr; static sptr make(int rate, int len, float freq); diff --git a/gr-filter/include/gnuradio/filter/dc_blocker_cc.h b/gr-filter/include/gnuradio/filter/dc_blocker_cc.h index 1dd89830ef..6a08ebf8ed 100644 --- a/gr-filter/include/gnuradio/filter/dc_blocker_cc.h +++ b/gr-filter/include/gnuradio/filter/dc_blocker_cc.h @@ -46,7 +46,7 @@ class FILTER_API dc_blocker_cc : virtual public sync_block { public: // gr::filter::dc_blocker_cc::sptr - typedef boost::shared_ptr<dc_blocker_cc> sptr; + typedef std::shared_ptr<dc_blocker_cc> sptr; /*! * Make a DC blocker block. diff --git a/gr-filter/include/gnuradio/filter/dc_blocker_ff.h b/gr-filter/include/gnuradio/filter/dc_blocker_ff.h index 6b792036af..89df5dd5ab 100644 --- a/gr-filter/include/gnuradio/filter/dc_blocker_ff.h +++ b/gr-filter/include/gnuradio/filter/dc_blocker_ff.h @@ -49,7 +49,7 @@ class FILTER_API dc_blocker_ff : virtual public sync_block { public: // gr::filter::dc_blocker_ff::sptr - typedef boost::shared_ptr<dc_blocker_ff> sptr; + typedef std::shared_ptr<dc_blocker_ff> sptr; /*! * Make a DC blocker block. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_ccc.h b/gr-filter/include/gnuradio/filter/fft_filter_ccc.h index 02d6fc1255..ca6ea58e40 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_ccc.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_ccc.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_ccc : virtual public sync_decimator { public: // gr::filter::fft_filter_ccc::sptr - typedef boost::shared_ptr<fft_filter_ccc> sptr; + typedef std::shared_ptr<fft_filter_ccc> sptr; /*! * Build an FFT filter blocks. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_ccf.h b/gr-filter/include/gnuradio/filter/fft_filter_ccf.h index b5f718a3b6..087af352f0 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_ccf.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_ccf.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_ccf : virtual public sync_decimator { public: // gr::filter::fft_filter_ccf::sptr - typedef boost::shared_ptr<fft_filter_ccf> sptr; + typedef std::shared_ptr<fft_filter_ccf> sptr; /*! * Build an FFT filter blocks. diff --git a/gr-filter/include/gnuradio/filter/fft_filter_fff.h b/gr-filter/include/gnuradio/filter/fft_filter_fff.h index 1681d65f0b..1a0e2ebf09 100644 --- a/gr-filter/include/gnuradio/filter/fft_filter_fff.h +++ b/gr-filter/include/gnuradio/filter/fft_filter_fff.h @@ -44,7 +44,7 @@ class FILTER_API fft_filter_fff : virtual public sync_decimator { public: // gr::filter::fft_filter_fff::sptr - typedef boost::shared_ptr<fft_filter_fff> sptr; + typedef std::shared_ptr<fft_filter_fff> sptr; /*! * Build an FFT filter block. diff --git a/gr-filter/include/gnuradio/filter/filter_delay_fc.h b/gr-filter/include/gnuradio/filter/filter_delay_fc.h index 670d226aa7..349592085b 100644 --- a/gr-filter/include/gnuradio/filter/filter_delay_fc.h +++ b/gr-filter/include/gnuradio/filter/filter_delay_fc.h @@ -41,7 +41,7 @@ class FILTER_API filter_delay_fc : virtual public sync_block { public: // gr::filter::filter_delay_fc::sptr - typedef boost::shared_ptr<filter_delay_fc> sptr; + typedef std::shared_ptr<filter_delay_fc> sptr; /*! * Build a filter with delay block. diff --git a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h index d2c6d04ae7..98bc935457 100644 --- a/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h +++ b/gr-filter/include/gnuradio/filter/filterbank_vcvcf.h @@ -31,7 +31,7 @@ namespace filter { class FILTER_API filterbank_vcvcf : virtual public block { public: - typedef boost::shared_ptr<filterbank_vcvcf> sptr; + typedef std::shared_ptr<filterbank_vcvcf> sptr; /*! * Build the filterbank. diff --git a/gr-filter/include/gnuradio/filter/fir_filter_blk.h b/gr-filter/include/gnuradio/filter/fir_filter_blk.h index aa5e9798a3..28640e8f0f 100644 --- a/gr-filter/include/gnuradio/filter/fir_filter_blk.h +++ b/gr-filter/include/gnuradio/filter/fir_filter_blk.h @@ -46,7 +46,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API fir_filter_blk : virtual public sync_decimator { public: - typedef boost::shared_ptr<fir_filter_blk<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<fir_filter_blk<IN_T, OUT_T, TAP_T>> sptr; /*! * \brief FIR filter with IN_T input, OUT_T output, and TAP_T taps diff --git a/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h b/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h index 83d0e540cc..6f225800e5 100644 --- a/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h +++ b/gr-filter/include/gnuradio/filter/freq_xlating_fir_filter.h @@ -46,7 +46,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API freq_xlating_fir_filter : virtual public sync_decimator { public: - typedef boost::shared_ptr<freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>> sptr; /*! * \brief FIR filter with IN_T input, OUT_T output, and diff --git a/gr-filter/include/gnuradio/filter/hilbert_fc.h b/gr-filter/include/gnuradio/filter/hilbert_fc.h index c9ed6059b1..485202987f 100644 --- a/gr-filter/include/gnuradio/filter/hilbert_fc.h +++ b/gr-filter/include/gnuradio/filter/hilbert_fc.h @@ -32,7 +32,7 @@ class FILTER_API hilbert_fc : virtual public sync_block { public: // gr::filter::hilbert_fc::sptr - typedef boost::shared_ptr<hilbert_fc> sptr; + typedef std::shared_ptr<hilbert_fc> sptr; /*! * Build a Hilbert transformer filter block. diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccc.h b/gr-filter/include/gnuradio/filter/iir_filter_ccc.h index d2dcaa29f9..79ca425e3e 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccc.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccc.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccc : virtual public sync_block { public: // gr::filter::iir_filter_ccc::sptr - typedef boost::shared_ptr<iir_filter_ccc> sptr; + typedef std::shared_ptr<iir_filter_ccc> sptr; static sptr make(const std::vector<gr_complex>& fftaps, const std::vector<gr_complex>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccd.h b/gr-filter/include/gnuradio/filter/iir_filter_ccd.h index 29e90ccbe1..c2b5e2a697 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccd.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccd.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccd : virtual public sync_block { public: // gr::filter::iir_filter_ccd::sptr - typedef boost::shared_ptr<iir_filter_ccd> sptr; + typedef std::shared_ptr<iir_filter_ccd> sptr; static sptr make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccf.h b/gr-filter/include/gnuradio/filter/iir_filter_ccf.h index 4fe8d9e3b9..58ac2c92c4 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccf.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccf.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccf : virtual public sync_block { public: // gr::filter::iir_filter_ccf::sptr - typedef boost::shared_ptr<iir_filter_ccf> sptr; + typedef std::shared_ptr<iir_filter_ccf> sptr; static sptr make(const std::vector<float>& fftaps, const std::vector<float>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ccz.h b/gr-filter/include/gnuradio/filter/iir_filter_ccz.h index 2441b37e22..8f9cc5cee4 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ccz.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ccz.h @@ -57,7 +57,7 @@ class FILTER_API iir_filter_ccz : virtual public sync_block { public: // gr::filter::iir_filter_ccz::sptr - typedef boost::shared_ptr<iir_filter_ccz> sptr; + typedef std::shared_ptr<iir_filter_ccz> sptr; static sptr make(const std::vector<gr_complexd>& fftaps, const std::vector<gr_complexd>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/iir_filter_ffd.h b/gr-filter/include/gnuradio/filter/iir_filter_ffd.h index 978400b025..44f2c77846 100644 --- a/gr-filter/include/gnuradio/filter/iir_filter_ffd.h +++ b/gr-filter/include/gnuradio/filter/iir_filter_ffd.h @@ -55,7 +55,7 @@ class FILTER_API iir_filter_ffd : virtual public sync_block { public: // gr::filter::iir_filter_ffd::sptr - typedef boost::shared_ptr<iir_filter_ffd> sptr; + typedef std::shared_ptr<iir_filter_ffd> sptr; static sptr make(const std::vector<double>& fftaps, const std::vector<double>& fbtaps, diff --git a/gr-filter/include/gnuradio/filter/interp_fir_filter.h b/gr-filter/include/gnuradio/filter/interp_fir_filter.h index fd607a452f..608134be11 100644 --- a/gr-filter/include/gnuradio/filter/interp_fir_filter.h +++ b/gr-filter/include/gnuradio/filter/interp_fir_filter.h @@ -48,7 +48,7 @@ class FILTER_API interp_fir_filter : virtual public sync_interpolator { public: // gr::filter::interp_fir_filter::sptr - typedef boost::shared_ptr<interp_fir_filter> sptr; + typedef std::shared_ptr<interp_fir_filter> sptr; /*! * \brief Interpolating FIR filter with IN_T input, OUT_T output, and TAP_T taps diff --git a/gr-filter/include/gnuradio/filter/ival_decimator.h b/gr-filter/include/gnuradio/filter/ival_decimator.h index 363e481e80..434bfddeeb 100644 --- a/gr-filter/include/gnuradio/filter/ival_decimator.h +++ b/gr-filter/include/gnuradio/filter/ival_decimator.h @@ -29,7 +29,7 @@ namespace filter { class FILTER_API ival_decimator : virtual public gr::sync_decimator { public: - typedef boost::shared_ptr<ival_decimator> sptr; + typedef std::shared_ptr<ival_decimator> sptr; static sptr make(int decimation, int data_size); }; diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h index 905574ad37..bf11a0f87e 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h @@ -25,7 +25,7 @@ class FILTER_API mmse_interpolator_cc : virtual public block { public: // gr::filter::mmse_interpolator_cc::sptr - typedef boost::shared_ptr<mmse_interpolator_cc> sptr; + typedef std::shared_ptr<mmse_interpolator_cc> sptr; /*! * \brief Build the interpolating MMSE filter (complex input, complex output) diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h index b96a5efb7c..24589c9a4f 100644 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h @@ -25,7 +25,7 @@ class FILTER_API mmse_interpolator_ff : virtual public block { public: // gr::filter::mmse_interpolator_ff::sptr - typedef boost::shared_ptr<mmse_interpolator_ff> sptr; + typedef std::shared_ptr<mmse_interpolator_ff> sptr; /*! * \brief Build the interpolating MMSE filter (float input, float output) diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h index 6e994400e6..03d1060f14 100644 --- a/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_cc.h @@ -30,7 +30,7 @@ class FILTER_API mmse_resampler_cc : virtual public block { public: // gr::filter::mmse_resampler_cc::sptr - typedef boost::shared_ptr<mmse_resampler_cc> sptr; + typedef std::shared_ptr<mmse_resampler_cc> sptr; /*! * \brief Build the resampling MMSE filter (complex input, complex output) diff --git a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h index ac905f3167..8494aa3380 100644 --- a/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h +++ b/gr-filter/include/gnuradio/filter/mmse_resampler_ff.h @@ -31,7 +31,7 @@ class FILTER_API mmse_resampler_ff : virtual public block { public: // gr::filter::mmse_resampler_ff::sptr - typedef boost::shared_ptr<mmse_resampler_ff> sptr; + typedef std::shared_ptr<mmse_resampler_ff> sptr; /*! * \brief Build the resampling MMSE filter (float input, float output) diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h index 87cd907fb1..783b1cfd5c 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccc.h @@ -35,7 +35,7 @@ class FILTER_API pfb_arb_resampler_ccc : virtual public block { public: // gr::filter::pfb_arb_resampler_ccc::sptr - typedef boost::shared_ptr<pfb_arb_resampler_ccc> sptr; + typedef std::shared_ptr<pfb_arb_resampler_ccc> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h index 85066aeb94..196905db52 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_ccf.h @@ -35,7 +35,7 @@ class FILTER_API pfb_arb_resampler_ccf : virtual public block { public: // gr::filter::pfb_arb_resampler_ccf::sptr - typedef boost::shared_ptr<pfb_arb_resampler_ccf> sptr; + typedef std::shared_ptr<pfb_arb_resampler_ccf> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h index 412c14c8db..ec3c719c7d 100644 --- a/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h +++ b/gr-filter/include/gnuradio/filter/pfb_arb_resampler_fff.h @@ -84,7 +84,7 @@ class FILTER_API pfb_arb_resampler_fff : virtual public block { public: // gr::filter::pfb_arb_resampler_fff::sptr - typedef boost::shared_ptr<pfb_arb_resampler_fff> sptr; + typedef std::shared_ptr<pfb_arb_resampler_fff> sptr; /*! * Build the polyphase filterbank arbitrary resampler. diff --git a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h index 01b8893f3a..b71f6bfc3b 100644 --- a/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_channelizer_ccf.h @@ -101,7 +101,7 @@ class FILTER_API pfb_channelizer_ccf : virtual public block { public: // gr::filter::pfb_channelizer_ccf::sptr - typedef boost::shared_ptr<pfb_channelizer_ccf> sptr; + typedef std::shared_ptr<pfb_channelizer_ccf> sptr; /*! * Build the polyphase filterbank decimator. diff --git a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h index 223b469145..34edd23b35 100644 --- a/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_decimator_ccf.h @@ -80,7 +80,7 @@ class FILTER_API pfb_decimator_ccf : virtual public sync_block { public: // gr::filter::pfb_decimator_ccf::sptr - typedef boost::shared_ptr<pfb_decimator_ccf> sptr; + typedef std::shared_ptr<pfb_decimator_ccf> sptr; /*! * Build the polyphase filterbank decimator. diff --git a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h index baf4bd4834..1303f3a6f4 100644 --- a/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_interpolator_ccf.h @@ -68,7 +68,7 @@ class FILTER_API pfb_interpolator_ccf : virtual public sync_interpolator { public: // gr::filter::pfb_interpolator_ccf::sptr - typedef boost::shared_ptr<pfb_interpolator_ccf> sptr; + typedef std::shared_ptr<pfb_interpolator_ccf> sptr; /*! * Build the polyphase filterbank interpolator. diff --git a/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h b/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h index af2abb8387..720d48183b 100644 --- a/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h +++ b/gr-filter/include/gnuradio/filter/pfb_synthesizer_ccf.h @@ -78,7 +78,7 @@ class FILTER_API pfb_synthesizer_ccf : virtual public sync_interpolator { public: // gr::filter::pfb_synthesizer_ccf::sptr - typedef boost::shared_ptr<pfb_synthesizer_ccf> sptr; + typedef std::shared_ptr<pfb_synthesizer_ccf> sptr; /*! * Build the polyphase synthesis filterbank. diff --git a/gr-filter/include/gnuradio/filter/rational_resampler_base.h b/gr-filter/include/gnuradio/filter/rational_resampler_base.h index 1d252bcd83..9b0af4b540 100644 --- a/gr-filter/include/gnuradio/filter/rational_resampler_base.h +++ b/gr-filter/include/gnuradio/filter/rational_resampler_base.h @@ -58,7 +58,7 @@ template <class IN_T, class OUT_T, class TAP_T> class FILTER_API rational_resampler_base : virtual public block { public: - typedef boost::shared_ptr<rational_resampler_base<IN_T, OUT_T, TAP_T>> sptr; + typedef std::shared_ptr<rational_resampler_base<IN_T, OUT_T, TAP_T>> sptr; /*! * Make a rational resampling FIR filter. diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h index 0c9cba34fc..7d349fb74b 100644 --- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h +++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_cc.h @@ -54,7 +54,7 @@ class FILTER_API single_pole_iir_filter_cc : virtual public sync_block { public: // gr::filter::single_pole_iir_filter_cc::sptr - typedef boost::shared_ptr<single_pole_iir_filter_cc> sptr; + typedef std::shared_ptr<single_pole_iir_filter_cc> sptr; static sptr make(double alpha, unsigned int vlen = 1); diff --git a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h index 504e142a9e..df48191e15 100644 --- a/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h +++ b/gr-filter/include/gnuradio/filter/single_pole_iir_filter_ff.h @@ -54,7 +54,7 @@ class FILTER_API single_pole_iir_filter_ff : virtual public sync_block { public: // gr::filter::single_pole_iir_filter_ff::sptr - typedef boost::shared_ptr<single_pole_iir_filter_ff> sptr; + typedef std::shared_ptr<single_pole_iir_filter_ff> sptr; static sptr make(double alpha, unsigned int vlen = 1); diff --git a/gr-network/include/gnuradio/network/tcp_sink.h b/gr-network/include/gnuradio/network/tcp_sink.h index 8cbc05fd3b..d171d2dcc0 100644 --- a/gr-network/include/gnuradio/network/tcp_sink.h +++ b/gr-network/include/gnuradio/network/tcp_sink.h @@ -38,7 +38,7 @@ namespace network { class NETWORK_API tcp_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<tcp_sink> sptr; + typedef std::shared_ptr<tcp_sink> sptr; /*! * Build a tcp_sink block. diff --git a/gr-network/include/gnuradio/network/udp_sink.h b/gr-network/include/gnuradio/network/udp_sink.h index 415cc22736..e14de8b50e 100644 --- a/gr-network/include/gnuradio/network/udp_sink.h +++ b/gr-network/include/gnuradio/network/udp_sink.h @@ -49,7 +49,7 @@ namespace network { class NETWORK_API udp_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<udp_sink> sptr; + typedef std::shared_ptr<udp_sink> sptr; /*! * Build a udp_sink block. diff --git a/gr-network/include/gnuradio/network/udp_source.h b/gr-network/include/gnuradio/network/udp_source.h index 7c90f875b1..b3062b54c0 100644 --- a/gr-network/include/gnuradio/network/udp_source.h +++ b/gr-network/include/gnuradio/network/udp_source.h @@ -46,7 +46,7 @@ namespace network { class NETWORK_API udp_source : virtual public gr::sync_block { public: - typedef boost::shared_ptr<udp_source> sptr; + typedef std::shared_ptr<udp_source> sptr; /*! * Build a udp_source block. 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. 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, diff --git a/gr-uhd/examples/c++/tags_demo.cc b/gr-uhd/examples/c++/tags_demo.cc index d8dd6513af..f900682653 100644 --- a/gr-uhd/examples/c++/tags_demo.cc +++ b/gr-uhd/examples/c++/tags_demo.cc @@ -86,7 +86,7 @@ int UHD_SAFE_MAIN(int argc, char* argv[]) usrp_source->set_samp_rate(samp_rate); usrp_source->set_center_freq(center_freq); - boost::shared_ptr<tag_sink_demo> tag_sink = boost::make_shared<tag_sink_demo>(); + std::shared_ptr<tag_sink_demo> tag_sink = std::make_shared<tag_sink_demo>(); //------------------------------------------------------------------ //-- connect the usrp source test blocks @@ -103,13 +103,13 @@ int UHD_SAFE_MAIN(int argc, char* argv[]) const uhd::time_spec_t time_now = usrp_sink->get_time_now(); const double actual_samp_rate = usrp_sink->get_samp_rate(); - boost::shared_ptr<tag_source_demo> tag_source = boost::make_shared<tag_source_demo>( - time_now.get_full_secs() + 1, - time_now.get_frac_secs(), // time now + 1 second - actual_samp_rate, - idle_dur, - burst_dur, - length_tag); + std::shared_ptr<tag_source_demo> tag_source = + std::make_shared<tag_source_demo>(time_now.get_full_secs() + 1, + time_now.get_frac_secs(), // time now + 1 second + actual_samp_rate, + idle_dur, + burst_dur, + length_tag); //------------------------------------------------------------------ //-- connect the usrp sink test blocks diff --git a/gr-uhd/include/gnuradio/uhd/amsg_source.h b/gr-uhd/include/gnuradio/uhd/amsg_source.h index 0c8a23d6b4..24a7c63530 100644 --- a/gr-uhd/include/gnuradio/uhd/amsg_source.h +++ b/gr-uhd/include/gnuradio/uhd/amsg_source.h @@ -24,7 +24,7 @@ class GR_UHD_API amsg_source { public: // gr::uhd::amsg_source::sptr - typedef boost::shared_ptr<amsg_source> sptr; + typedef std::shared_ptr<amsg_source> sptr; /*! * \brief Destructor diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_block.h b/gr-uhd/include/gnuradio/uhd/rfnoc_block.h index a25a502542..9c2860a64c 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_block.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_block.h @@ -30,7 +30,7 @@ protected: rfnoc_block() {} // For virtual subclassing public: - using sptr = boost::shared_ptr<rfnoc_block>; + using sptr = std::shared_ptr<rfnoc_block>; //! Factory function to create a UHD block controller reference // diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_block_generic.h b/gr-uhd/include/gnuradio/uhd/rfnoc_block_generic.h index 9cf7f91de6..5a97bd7f7a 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_block_generic.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_block_generic.h @@ -26,7 +26,7 @@ namespace uhd { class GR_UHD_API rfnoc_block_generic : virtual public rfnoc_block { public: - typedef boost::shared_ptr<rfnoc_block_generic> sptr; + typedef std::shared_ptr<rfnoc_block_generic> sptr; /*! * \param graph Reference to the underlying rfnoc_graph object diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_ddc.h b/gr-uhd/include/gnuradio/uhd/rfnoc_ddc.h index 9b3a0d4c13..322f483f1e 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_ddc.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_ddc.h @@ -22,7 +22,7 @@ namespace uhd { class GR_UHD_API rfnoc_ddc : virtual public rfnoc_block { public: - typedef boost::shared_ptr<rfnoc_ddc> sptr; + typedef std::shared_ptr<rfnoc_ddc> sptr; /*! * \param graph Reference to the rfnoc_graph object this block is attached to diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_duc.h b/gr-uhd/include/gnuradio/uhd/rfnoc_duc.h index f6b1227066..8a8f823566 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_duc.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_duc.h @@ -23,7 +23,7 @@ namespace uhd { class GR_UHD_API rfnoc_duc : virtual public rfnoc_block { public: - typedef boost::shared_ptr<rfnoc_duc> sptr; + typedef std::shared_ptr<rfnoc_duc> sptr; /*! * \param graph Reference to the rfnoc_graph object this block is attached to diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_graph.h b/gr-uhd/include/gnuradio/uhd/rfnoc_graph.h index efa0e14c30..c51bf53b47 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_graph.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_graph.h @@ -13,7 +13,7 @@ #include <uhd/rfnoc/noc_block_base.hpp> #include <uhd/stream.hpp> #include <uhd/types/device_addr.hpp> -#include <boost/shared_ptr.hpp> +#include <memory> namespace gr { namespace uhd { @@ -28,7 +28,7 @@ class rfnoc_block; class GR_UHD_API rfnoc_graph { public: - using sptr = boost::shared_ptr<rfnoc_graph>; + using sptr = std::shared_ptr<rfnoc_graph>; static sptr make(const ::uhd::device_addr_t& dev_addr); diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_rx_radio.h b/gr-uhd/include/gnuradio/uhd/rfnoc_rx_radio.h index 6a8e43ad1a..a99a1d5c1e 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_rx_radio.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_rx_radio.h @@ -27,7 +27,7 @@ namespace uhd { class GR_UHD_API rfnoc_rx_radio : virtual public rfnoc_block { public: - typedef boost::shared_ptr<rfnoc_rx_radio> sptr; + typedef std::shared_ptr<rfnoc_rx_radio> sptr; /*! * \param graph Reference to the underlying rfnoc_graph object diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_rx_streamer.h b/gr-uhd/include/gnuradio/uhd/rfnoc_rx_streamer.h index fdcd15e45a..3e186d8b72 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_rx_streamer.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_rx_streamer.h @@ -32,7 +32,7 @@ namespace uhd { class GR_UHD_API rfnoc_rx_streamer : virtual public gr::sync_block { public: - typedef boost::shared_ptr<rfnoc_rx_streamer> sptr; + typedef std::shared_ptr<rfnoc_rx_streamer> sptr; /*! * \param graph Reference to the graph this block is connected to diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_tx_radio.h b/gr-uhd/include/gnuradio/uhd/rfnoc_tx_radio.h index 9fe115be29..aa8875d916 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_tx_radio.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_tx_radio.h @@ -27,7 +27,7 @@ namespace uhd { class GR_UHD_API rfnoc_tx_radio : virtual public rfnoc_block { public: - typedef boost::shared_ptr<rfnoc_tx_radio> sptr; + typedef std::shared_ptr<rfnoc_tx_radio> sptr; /*! * \param graph Reference to the underlying rfnoc_graph object diff --git a/gr-uhd/include/gnuradio/uhd/rfnoc_tx_streamer.h b/gr-uhd/include/gnuradio/uhd/rfnoc_tx_streamer.h index 251575a0ef..7617419103 100644 --- a/gr-uhd/include/gnuradio/uhd/rfnoc_tx_streamer.h +++ b/gr-uhd/include/gnuradio/uhd/rfnoc_tx_streamer.h @@ -32,7 +32,7 @@ namespace uhd { class GR_UHD_API rfnoc_tx_streamer : virtual public gr::sync_block { public: - typedef boost::shared_ptr<rfnoc_tx_streamer> sptr; + typedef std::shared_ptr<rfnoc_tx_streamer> sptr; /*! * \param graph Reference to the graph this block is connected to diff --git a/gr-uhd/include/gnuradio/uhd/usrp_sink.h b/gr-uhd/include/gnuradio/uhd/usrp_sink.h index 8924d76c47..504856c6e7 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_sink.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_sink.h @@ -89,7 +89,7 @@ class GR_UHD_API usrp_sink : virtual public usrp_block { public: // gr::uhd::usrp_sink::sptr - typedef boost::shared_ptr<usrp_sink> sptr; + typedef std::shared_ptr<usrp_sink> sptr; /*! * \param device_addr the address to identify the hardware diff --git a/gr-uhd/include/gnuradio/uhd/usrp_source.h b/gr-uhd/include/gnuradio/uhd/usrp_source.h index b57a7c13e0..8165a7edb9 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_source.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_source.h @@ -46,7 +46,7 @@ class GR_UHD_API usrp_source : virtual public usrp_block { public: // gr::uhd::usrp_source::sptr - typedef boost::shared_ptr<usrp_source> sptr; + typedef std::shared_ptr<usrp_source> sptr; /*! * \param device_addr the address to identify the hardware diff --git a/gr-uhd/lib/rfnoc_graph_impl.cc b/gr-uhd/lib/rfnoc_graph_impl.cc index 436faeedea..287c62df05 100644 --- a/gr-uhd/lib/rfnoc_graph_impl.cc +++ b/gr-uhd/lib/rfnoc_graph_impl.cc @@ -210,5 +210,5 @@ private: rfnoc_graph::sptr rfnoc_graph::make(const device_addr_t& dev_addr) { check_abi(); - return boost::make_shared<rfnoc_graph_impl>(dev_addr); + return std::make_shared<rfnoc_graph_impl>(dev_addr); } diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index f07f3a41f8..c97512326d 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -144,31 +144,31 @@ #if UHD_VERSION < 4000000 -%template(filter_info_base_sptr) boost::shared_ptr<uhd::filter_info_base>; -%template(analog_filter_base_stpr) boost::shared_ptr<uhd::analog_filter_base>; -%template(analog_filter_lp_stpr) boost::shared_ptr<uhd::analog_filter_lp>; -%template(digital_filter_base_int16_t_sptr) boost::shared_ptr<uhd::digital_filter_base<int16_t>>; -%template(digital_filter_fir_int16_t_sptr) boost::shared_ptr<uhd::digital_filter_fir<int16_t>>; +%template(filter_info_base_sptr) std::shared_ptr<uhd::filter_info_base>; +%template(analog_filter_base_stpr) std::shared_ptr<uhd::analog_filter_base>; +%template(analog_filter_lp_stpr) std::shared_ptr<uhd::analog_filter_lp>; +%template(digital_filter_base_int16_t_sptr) std::shared_ptr<uhd::digital_filter_base<int16_t>>; +%template(digital_filter_fir_int16_t_sptr) std::shared_ptr<uhd::digital_filter_fir<int16_t>>; %extend uhd::filter_info_base{ - boost::shared_ptr<uhd::analog_filter_base> to_analog_info_base(boost::shared_ptr<uhd::filter_info_base> ptr) { - return boost::dynamic_pointer_cast<uhd::analog_filter_base>(ptr); + std::shared_ptr<uhd::analog_filter_base> to_analog_info_base(std::shared_ptr<uhd::filter_info_base> ptr) { + return std::dynamic_pointer_cast<uhd::analog_filter_base>(ptr); } - boost::shared_ptr<uhd::analog_filter_lp> to_analog_filter_lp(boost::shared_ptr<uhd::filter_info_base> ptr) { - return boost::dynamic_pointer_cast<uhd::analog_filter_lp>(ptr); + std::shared_ptr<uhd::analog_filter_lp> to_analog_filter_lp(std::shared_ptr<uhd::filter_info_base> ptr) { + return std::dynamic_pointer_cast<uhd::analog_filter_lp>(ptr); } - boost::shared_ptr<uhd::digital_filter_base<int16_t>> to_digital_filter_base_int16(boost::shared_ptr<uhd::filter_info_base> ptr) { - return boost::dynamic_pointer_cast<uhd::digital_filter_base<int16_t>>(ptr); + std::shared_ptr<uhd::digital_filter_base<int16_t>> to_digital_filter_base_int16(std::shared_ptr<uhd::filter_info_base> ptr) { + return std::dynamic_pointer_cast<uhd::digital_filter_base<int16_t>>(ptr); } - boost::shared_ptr<uhd::digital_filter_fir<int16_t>> to_digital_filter_fir_int16(boost::shared_ptr<uhd::filter_info_base> ptr) { - return boost::dynamic_pointer_cast<uhd::digital_filter_fir<int16_t>>(ptr); + std::shared_ptr<uhd::digital_filter_fir<int16_t>> to_digital_filter_fir_int16(std::shared_ptr<uhd::filter_info_base> ptr) { + return std::dynamic_pointer_cast<uhd::digital_filter_fir<int16_t>>(ptr); } } -%template(dboard_iface_sptr) boost::shared_ptr<uhd::usrp::dboard_iface>; +%template(dboard_iface_sptr) std::shared_ptr<uhd::usrp::dboard_iface>; #else diff --git a/gr-utils/python/modtool/templates/templates.py b/gr-utils/python/modtool/templates/templates.py index a3a84ecda0..fe799cd026 100644 --- a/gr-utils/python/modtool/templates/templates.py +++ b/gr-utils/python/modtool/templates/templates.py @@ -275,7 +275,7 @@ namespace gr { class ${modname.upper()}_API ${blockname} : virtual public gr::${grblocktype} { public: - typedef boost::shared_ptr<${blockname}> sptr; + typedef std::shared_ptr<${blockname}> sptr; /*! * \brief Return a shared_ptr to a new instance of ${modname}::${blockname}. @@ -712,7 +712,7 @@ class ${modname.upper()}_API ${blockname} class ${modname}_${blockname}; -typedef boost::shared_ptr<${modname}_${blockname}> ${modname}_${blockname}_sptr; +typedef std::shared_ptr<${modname}_${blockname}> ${modname}_${blockname}_sptr; ${modname.upper()}_API ${modname}_${blockname}_sptr ${modname}_make_${blockname} (${arglist}); diff --git a/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h index 857992fa75..75d6d49df8 100644 --- a/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h +++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h @@ -30,7 +30,7 @@ class VIDEO_SDL_API sink_s : virtual public sync_block { public: // gr::video_sdl::sink_s::sptr - typedef boost::shared_ptr<sink_s> sptr; + typedef std::shared_ptr<sink_s> sptr; static sptr make(double framerate, int width, diff --git a/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h index 69f98f5195..95e57d5c89 100644 --- a/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h +++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h @@ -30,7 +30,7 @@ class VIDEO_SDL_API sink_uc : virtual public sync_block { public: // gr::video_sdl::sink_uc::sptr - typedef boost::shared_ptr<sink_uc> sptr; + typedef std::shared_ptr<sink_uc> sptr; static sptr make(double framerate, int width, diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h index 12ddebc1cd..01e729af0e 100644 --- a/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API alaw_decode_bs : virtual public sync_block { public: // gr::vocoder::alaw_decode_bs::sptr - typedef boost::shared_ptr<alaw_decode_bs> sptr; + typedef std::shared_ptr<alaw_decode_bs> sptr; /*! * \brief Make alaw decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h index ba7e81d958..210b479a31 100644 --- a/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API alaw_encode_sb : virtual public sync_block { public: // gr::vocoder::alaw_encode_sb::sptr - typedef boost::shared_ptr<alaw_encode_sb> sptr; + typedef std::shared_ptr<alaw_encode_sb> sptr; /*! * \brief Make alaw encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h index a5b752ff93..340ab68b30 100644 --- a/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h @@ -32,7 +32,7 @@ class VOCODER_API codec2_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::codec2_decode_ps::sptr - typedef boost::shared_ptr<codec2_decode_ps> sptr; + typedef std::shared_ptr<codec2_decode_ps> sptr; /*! * \brief Make Codec2 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h index 6a2cceb125..4d8ad3b279 100644 --- a/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h @@ -33,7 +33,7 @@ class VOCODER_API codec2_encode_sp : virtual public sync_decimator { public: // gr::vocoder::codec2_encode_sp::sptr - typedef boost::shared_ptr<codec2_encode_sp> sptr; + typedef std::shared_ptr<codec2_encode_sp> sptr; /*! * \brief Make Codec2 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h index f4551b95e2..8d791c9a29 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h @@ -79,7 +79,7 @@ class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator { public: // gr::vocoder::cvsd_decode_bs::sptr - typedef boost::shared_ptr<cvsd_decode_bs> sptr; + typedef std::shared_ptr<cvsd_decode_bs> sptr; /*! * \brief Constructor parameters to initialize the CVSD decoder. diff --git a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h index 1a4961cca6..ee3591f7e2 100644 --- a/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h @@ -76,7 +76,7 @@ class VOCODER_API cvsd_encode_sb : virtual public sync_decimator { public: // gr::vocoder::cvsd_encode_sb::sptr - typedef boost::shared_ptr<cvsd_encode_sb> sptr; + typedef std::shared_ptr<cvsd_encode_sb> sptr; /*! * \brief Constructor parameters to initialize the CVSD encoder. diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h index b5a629ea3d..5077329465 100644 --- a/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h +++ b/gr-vocoder/include/gnuradio/vocoder/freedv_rx_ss.h @@ -31,7 +31,7 @@ namespace vocoder { class VOCODER_API freedv_rx_ss : virtual public gr::block { public: - typedef boost::shared_ptr<freedv_rx_ss> sptr; + typedef std::shared_ptr<freedv_rx_ss> sptr; /*! * \brief Make FreeDV modem demodulator block. diff --git a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h index a52c62bd22..b2b42b4bba 100644 --- a/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h +++ b/gr-vocoder/include/gnuradio/vocoder/freedv_tx_ss.h @@ -30,7 +30,7 @@ namespace vocoder { class VOCODER_API freedv_tx_ss : virtual public gr::sync_block { public: - typedef boost::shared_ptr<freedv_tx_ss> sptr; + typedef std::shared_ptr<freedv_tx_ss> sptr; /*! * \brief Make FreeDV Modem modulator block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h index 53440c3d71..82ec4c0643 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g721_decode_bs : virtual public sync_block { public: // gr::vocoder::g721_decode_bs::sptr - typedef boost::shared_ptr<g721_decode_bs> sptr; + typedef std::shared_ptr<g721_decode_bs> sptr; /*! * \brief Make G721 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h index 4ffd6c06d1..b8ca52d70d 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g721_encode_sb : virtual public sync_block { public: // gr::vocoder::g721_encode_sb::sptr - typedef boost::shared_ptr<g721_encode_sb> sptr; + typedef std::shared_ptr<g721_encode_sb> sptr; /*! * \brief Make G721 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h index 94dbf7223c..fb6f9d95f6 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g723_24_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_24_decode_bs::sptr - typedef boost::shared_ptr<g723_24_decode_bs> sptr; + typedef std::shared_ptr<g723_24_decode_bs> sptr; /*! * \brief Make G722_24 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h index a795887c20..492ce45d1c 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g723_24_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_24_encode_sb::sptr - typedef boost::shared_ptr<g723_24_encode_sb> sptr; + typedef std::shared_ptr<g723_24_encode_sb> sptr; /*! * \brief Make G722_24 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h index d3aeed6eb9..22beb197a4 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API g723_40_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_40_decode_bs::sptr - typedef boost::shared_ptr<g723_40_decode_bs> sptr; + typedef std::shared_ptr<g723_40_decode_bs> sptr; /*! * \brief Make G722_40 decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h index a24a3a279c..06468eb18c 100644 --- a/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API g723_40_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_40_encode_sb::sptr - typedef boost::shared_ptr<g723_40_encode_sb> sptr; + typedef std::shared_ptr<g723_40_encode_sb> sptr; /*! * \brief Make G722_40 encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h index 40c066bdbc..2b97045c76 100644 --- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h @@ -28,7 +28,7 @@ class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::gsm_fr_decode_ps::sptr - typedef boost::shared_ptr<gsm_fr_decode_ps> sptr; + typedef std::shared_ptr<gsm_fr_decode_ps> sptr; /*! * \brief Make GSM decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h index 0c64bc2f74..ab3c3026a3 100644 --- a/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h @@ -28,7 +28,7 @@ class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator { public: // gr::vocoder::gsm_fr_encode_sp::sptr - typedef boost::shared_ptr<gsm_fr_encode_sp> sptr; + typedef std::shared_ptr<gsm_fr_encode_sp> sptr; /*! * \brief Make GSM encoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h index 70c9c80f25..1696e2c6c9 100644 --- a/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h @@ -25,7 +25,7 @@ class VOCODER_API ulaw_decode_bs : virtual public sync_block { public: // gr::vocoder::ulaw_decode_bs::sptr - typedef boost::shared_ptr<ulaw_decode_bs> sptr; + typedef std::shared_ptr<ulaw_decode_bs> sptr; /*! * \brief Make ulaw decoder block. diff --git a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h index 07741bb8aa..b63d5420ba 100644 --- a/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h @@ -25,7 +25,7 @@ class VOCODER_API ulaw_encode_sb : virtual public sync_block { public: // gr::vocoder::ulaw_encode_sb::sptr - typedef boost::shared_ptr<ulaw_encode_sb> sptr; + typedef std::shared_ptr<ulaw_encode_sb> sptr; /*! * \brief Make ulaw encoder block. diff --git a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h index 94aeee4ab5..64b8df87c5 100644 --- a/gr-wavelet/include/gnuradio/wavelet/squash_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/squash_ff.h @@ -26,7 +26,7 @@ class WAVELET_API squash_ff : virtual public sync_block { public: // gr::wavelet::squash_ff::sptr - typedef boost::shared_ptr<squash_ff> sptr; + typedef std::shared_ptr<squash_ff> sptr; /*! * \param igrid diff --git a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h index 3ec6ee86a1..0107e52328 100644 --- a/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/wavelet_ff.h @@ -25,7 +25,7 @@ class WAVELET_API wavelet_ff : virtual public sync_block { public: // gr::wavelet::wavelet_ff:sptr - typedef boost::shared_ptr<wavelet_ff> sptr; + typedef std::shared_ptr<wavelet_ff> sptr; /*! * \param size diff --git a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h index 12cf9efa10..3fcb597745 100644 --- a/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h +++ b/gr-wavelet/include/gnuradio/wavelet/wvps_ff.h @@ -27,7 +27,7 @@ class WAVELET_API wvps_ff : virtual public sync_block { public: // gr::wavelet::wvps_ff::sptr - typedef boost::shared_ptr<wvps_ff> sptr; + typedef std::shared_ptr<wvps_ff> sptr; /*! \param ilen diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h index 470c357f6c..6bccc19001 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/pub_msg_sink.h @@ -31,7 +31,7 @@ namespace zeromq { class ZEROMQ_API pub_msg_sink : virtual public gr::block { public: - typedef boost::shared_ptr<pub_msg_sink> sptr; + typedef std::shared_ptr<pub_msg_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::pub_msg_sink. diff --git a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h index d9410c48cf..073c366065 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pub_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/pub_sink.h @@ -37,7 +37,7 @@ namespace zeromq { class ZEROMQ_API pub_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<pub_sink> sptr; + typedef std::shared_ptr<pub_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::pub_sink. diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h index c62cc4c50e..5a4e1a88a2 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API pull_msg_source : virtual public gr::block { public: - typedef boost::shared_ptr<pull_msg_source> sptr; + typedef std::shared_ptr<pull_msg_source> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::pull_msg_source. diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_source.h index 90c280c4ba..39d3ab02c2 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pull_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/pull_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API pull_source : virtual public gr::sync_block { public: - typedef boost::shared_ptr<pull_source> sptr; + typedef std::shared_ptr<pull_source> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::pull_source. diff --git a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h index c7641d5c31..41c5fba042 100644 --- a/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/push_msg_sink.h @@ -30,7 +30,7 @@ namespace zeromq { class ZEROMQ_API push_msg_sink : virtual public gr::block { public: - typedef boost::shared_ptr<push_msg_sink> sptr; + typedef std::shared_ptr<push_msg_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::push_msg_sink diff --git a/gr-zeromq/include/gnuradio/zeromq/push_sink.h b/gr-zeromq/include/gnuradio/zeromq/push_sink.h index 5721eae7b6..935df07192 100644 --- a/gr-zeromq/include/gnuradio/zeromq/push_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/push_sink.h @@ -32,7 +32,7 @@ namespace zeromq { class ZEROMQ_API push_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<push_sink> sptr; + typedef std::shared_ptr<push_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::push_sink diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h index 3786d5f4da..4c3d54adac 100644 --- a/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/rep_msg_sink.h @@ -30,7 +30,7 @@ namespace zeromq { class ZEROMQ_API rep_msg_sink : virtual public gr::block { public: - typedef boost::shared_ptr<rep_msg_sink> sptr; + typedef std::shared_ptr<rep_msg_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::rep_msg_sink. diff --git a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h index 16ac77e701..20f4e46823 100644 --- a/gr-zeromq/include/gnuradio/zeromq/rep_sink.h +++ b/gr-zeromq/include/gnuradio/zeromq/rep_sink.h @@ -30,7 +30,7 @@ namespace zeromq { class ZEROMQ_API rep_sink : virtual public gr::sync_block { public: - typedef boost::shared_ptr<rep_sink> sptr; + typedef std::shared_ptr<rep_sink> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::rep_sink. diff --git a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h index 197fd2db43..09d316004a 100644 --- a/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/req_msg_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API req_msg_source : virtual public gr::block { public: - typedef boost::shared_ptr<req_msg_source> sptr; + typedef std::shared_ptr<req_msg_source> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::req_msg_source. diff --git a/gr-zeromq/include/gnuradio/zeromq/req_source.h b/gr-zeromq/include/gnuradio/zeromq/req_source.h index 498a245445..3ce39251bf 100644 --- a/gr-zeromq/include/gnuradio/zeromq/req_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/req_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API req_source : virtual public gr::sync_block { public: - typedef boost::shared_ptr<req_source> sptr; + typedef std::shared_ptr<req_source> sptr; /*! * \brief Return a shared_ptr to a new instance of zeromq::req_source. diff --git a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h index 52502def92..3d0cdc525b 100644 --- a/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/sub_msg_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API sub_msg_source : virtual public gr::block { public: - typedef boost::shared_ptr<sub_msg_source> sptr; + typedef std::shared_ptr<sub_msg_source> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::sub_msg_source. diff --git a/gr-zeromq/include/gnuradio/zeromq/sub_source.h b/gr-zeromq/include/gnuradio/zeromq/sub_source.h index c2be39e615..a5d3d56daa 100644 --- a/gr-zeromq/include/gnuradio/zeromq/sub_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/sub_source.h @@ -28,7 +28,7 @@ namespace zeromq { class ZEROMQ_API sub_source : virtual public gr::sync_block { public: - typedef boost::shared_ptr<sub_source> sptr; + typedef std::shared_ptr<sub_source> sptr; /*! * \brief Return a shared_ptr to a new instance of gr::zeromq::sub_source. |