diff options
| author | Thomas Habets <thomas@habets.se> | 2020-03-14 12:01:44 +0000 |
|---|---|---|
| committer | Michael Dickens <michael.dickens@ettus.com> | 2020-04-01 11:44:45 -0400 |
| commit | 7a9169fe8cca1cb378be0d0d403e03a338ffbfda (patch) | |
| tree | fef77ae9c34538b78e4172580cb5ecdc24d40134 /gnuradio-runtime/include/gnuradio | |
| parent | 82262753a56d15cfa6343044c726cf0035c38d9c (diff) | |
Switch from boost pointers to std C++11 pointers
Most of this code is automated code changes:
```
set -e
SUB="s/dummy/dummy/"
for i in shared_ptr make_shared dynamic_pointer_cast weak_ptr enable_shared_from_this get_deleter; do
SUB="$SUB;s/boost::$i/std::$i/g"
done
SUB="$SUB;s^#include <boost/shared_ptr.hpp>^#include <memory>^g"
SUB="$SUB;s^namespace boost^namespace std^g"
find . \( -name "*.cc" -o -name "*.h" -o -name "*.i" -o -name "*.cxx" -o -name "*.py" \) -print0 | xargs -0 sed -i "$SUB"
```
Only one manual change. In `./gr-fec/lib/fec_mtrx_impl.cc`, add
`#include <algorithm>`.
Diffstat (limited to 'gnuradio-runtime/include/gnuradio')
23 files changed, 56 insertions, 57 deletions
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> |