3 files changed, 10 insertions, 12 deletions

diff --git a/host/lib/usrp/usrp1/io_impl.cpp b/host/lib/usrp/usrp1/io_impl.cpp
index 52a7c6650..88cbab073 100644
--- a/host/lib/usrp/usrp1/io_impl.cpp
+++ b/host/lib/usrp/usrp1/io_impl.cpp
@@ -159,10 +159,8 @@ bool usrp1_impl::io_impl::get_send_buffs(
     //calculate the buffer pointer and size given the offset
     //references to the buffers are held in the bound function
     buffs[0] = managed_send_buffer::make_safe(
-        boost::asio::buffer(
-            curr_buff->buff->cast<char *>() + curr_buff->offset,
-            curr_buff->buff->size()         - curr_buff->offset
-        ),
+        curr_buff->buff->cast<char *>() + curr_buff->offset,
+        curr_buff->buff->size()         - curr_buff->offset,
         boost::bind(&usrp1_impl::io_impl::commit_send_buff, this, curr_buff, next_buff, _1)
     );
 
@@ -222,7 +220,7 @@ size_t usrp1_impl::get_max_send_samps_per_packet(void) const {
 }
 
 size_t usrp1_impl::send(
-    const std::vector<const void *> &buffs, size_t num_samps,
+    const send_buffs_type &buffs, size_t num_samps,
     const tx_metadata_t &metadata, const io_type_t &io_type,
     send_mode_t send_mode, double timeout
 ){
@@ -300,7 +298,7 @@ size_t usrp1_impl::get_max_recv_samps_per_packet(void) const {
 }
 
 size_t usrp1_impl::recv(
-    const std::vector<void *> &buffs, size_t num_samps,
+    const recv_buffs_type &buffs, size_t num_samps,
     rx_metadata_t &metadata, const io_type_t &io_type,
     recv_mode_t recv_mode, double timeout
 ){
diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
index 246df93eb..e1b671811 100644
--- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp
+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp
@@ -39,7 +39,7 @@ public:
     soft_time_ctrl_impl(const cb_fcn_type &stream_on_off):
         _nsamps_remaining(0),
         _stream_mode(stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS),
-        _cmd_queue(bounded_buffer<boost::any>::make(2)),
+        _cmd_queue(2),
         _stream_on_off(stream_on_off)
     {
         //synchronously spawn a new thread
@@ -112,7 +112,7 @@ public:
     }
 
     void issue_stream_cmd(const stream_cmd_t &cmd){
-        _cmd_queue->push_with_wait(cmd);
+        _cmd_queue.push_with_wait(cmd);
     }
 
     void stream_on_off(bool enb){
@@ -180,7 +180,7 @@ public:
         try{
             boost::any cmd;
             while (true){
-                _cmd_queue->pop_with_wait(cmd);
+                _cmd_queue.pop_with_wait(cmd);
                 recv_cmd_handle_cmd(boost::any_cast<stream_cmd_t>(cmd));
             }
         } catch(const boost::thread_interrupted &){}
@@ -191,7 +191,7 @@ private:
     size_t _nsamps_remaining;
     stream_cmd_t::stream_mode_t _stream_mode;
     time_spec_t _time_offset;
-    bounded_buffer<boost::any>::sptr _cmd_queue;
+    bounded_buffer<boost::any> _cmd_queue;
     const cb_fcn_type _stream_on_off;
     boost::thread_group _thread_group;
 };
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp
index 28199ebe3..1d9f6709f 100644
--- a/host/lib/usrp/usrp1/usrp1_impl.hpp
+++ b/host/lib/usrp/usrp1/usrp1_impl.hpp
@@ -80,13 +80,13 @@ public:
     ~usrp1_impl(void);
 
     //the io interface
-    size_t send(const std::vector<const void *> &,
+    size_t send(const send_buffs_type &,
                 size_t,
                 const uhd::tx_metadata_t &,
                 const uhd::io_type_t &,
                 send_mode_t, double);
 
-    size_t recv(const std::vector<void *> &,
+    size_t recv(const recv_buffs_type &,
                 size_t, uhd::rx_metadata_t &,
                 const uhd::io_type_t &,
                 recv_mode_t, double);