diff --git a/host/umtrx_fifo_ctrl.hpp b/host/umtrx_fifo_ctrl.hpp index 3da45254..12d18263 100644 --- a/host/umtrx_fifo_ctrl.hpp +++ b/host/umtrx_fifo_ctrl.hpp @@ -34,7 +34,7 @@ class umtrx_fifo_ctrl : public uhd::wb_iface, public uhd::spi_iface { public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; //! Make a new FIFO control object static sptr make(uhd::transport::zero_copy_if::sptr xport, const boost::uint32_t sid, const size_t window_size); diff --git a/host/umtrx_iface.hpp b/host/umtrx_iface.hpp index b7cd2a52..23de9237 100644 --- a/host/umtrx_iface.hpp +++ b/host/umtrx_iface.hpp @@ -34,7 +34,7 @@ */ class umtrx_iface : public uhd::wb_iface, public uhd::spi_iface, public uhd::i2c_iface{ public: - typedef boost::shared_ptr sptr; + typedef std::shared_ptr sptr; /*! * Make a new umtrx interface with the control transport. * \param ctrl_transport the udp transport object diff --git a/host/umtrx_impl.hpp b/host/umtrx_impl.hpp index 5ce3789b..6b42880d 100644 --- a/host/umtrx_impl.hpp +++ b/host/umtrx_impl.hpp @@ -236,8 +236,8 @@ private: void client_query_handle1(const boost::property_tree::ptree &request, boost::property_tree::ptree &response); //streaming - std::vector > _rx_streamers; - std::vector > _tx_streamers; + std::vector > _rx_streamers; + std::vector > _tx_streamers; boost::mutex _setupMutex; }; diff --git a/host/umtrx_io_impl.cpp b/host/umtrx_io_impl.cpp index 974896da..3571e26d 100644 --- a/host/umtrx_io_impl.cpp +++ b/host/umtrx_io_impl.cpp @@ -39,7 +39,6 @@ static const size_t DEFAULT_NUM_FRAMES = 32; using namespace uhd; using namespace uhd::usrp; using namespace uhd::transport; -namespace asio = boost::asio; namespace pt = boost::posix_time; /*********************************************************************** @@ -110,8 +109,8 @@ void umtrx_impl::update_rates(void) void umtrx_impl::update_rx_samp_rate(const size_t dsp, const double rate) { - boost::shared_ptr my_streamer = - boost::dynamic_pointer_cast(_rx_streamers[dsp].lock()); + std::shared_ptr my_streamer = + std::dynamic_pointer_cast(_rx_streamers[dsp].lock()); if (not my_streamer) return; my_streamer->set_samp_rate(rate); @@ -121,8 +120,8 @@ void umtrx_impl::update_rx_samp_rate(const size_t dsp, const double rate) void umtrx_impl::update_tx_samp_rate(const size_t dsp, const double rate) { - boost::shared_ptr my_streamer = - boost::dynamic_pointer_cast(_tx_streamers[dsp].lock()); + std::shared_ptr my_streamer = + std::dynamic_pointer_cast(_tx_streamers[dsp].lock()); if (not my_streamer) return; my_streamer->set_samp_rate(rate); @@ -135,15 +134,15 @@ void umtrx_impl::update_tick_rate(const double rate) //update the tick rate on all existing streamers -> thread safe for (size_t i = 0; i < _rx_streamers.size(); i++) { - boost::shared_ptr my_streamer = - boost::dynamic_pointer_cast(_rx_streamers[i].lock()); + std::shared_ptr my_streamer = + std::dynamic_pointer_cast(_rx_streamers[i].lock()); if (not my_streamer) continue; my_streamer->set_tick_rate(rate); } for (size_t i = 0; i < _tx_streamers.size(); i++) { - boost::shared_ptr my_streamer = - boost::dynamic_pointer_cast(_tx_streamers[i].lock()); + std::shared_ptr my_streamer = + std::dynamic_pointer_cast(_tx_streamers[i].lock()); if (not my_streamer) continue; my_streamer->set_tick_rate(rate); } @@ -233,7 +232,7 @@ uhd::rx_streamer::sptr umtrx_impl::get_rx_stream(const uhd::stream_args_t &args_ const size_t spp = unsigned(args.args.cast("spp", bpp/bpi)); //make the new streamer given the samples per packet - boost::shared_ptr my_streamer = boost::make_shared(spp); + std::shared_ptr my_streamer = std::make_shared(spp); //init some streamer stuff my_streamer->resize(args.channels.size()); @@ -459,7 +458,7 @@ uhd::tx_streamer::sptr umtrx_impl::get_tx_stream(const uhd::stream_args_t &args_ const size_t spp = bpp/convert::get_bytes_per_item(args.otw_format); //make the new streamer given the samples per packet - boost::shared_ptr my_streamer = boost::make_shared(spp); + std::shared_ptr my_streamer = std::make_shared(spp); //init some streamer stuff my_streamer->resize(args.channels.size());