Merge branch 'timeout' into usrp_e_mmap

2 files changed, 2 insertions, 5 deletions

diff --git a/host/lib/transport/libusb1_zero_copy.cpp b/host/lib/transport/libusb1_zero_copy.cpp
index ab48e4fc4..819874483 100644
--- a/host/lib/transport/libusb1_zero_copy.cpp
+++ b/host/lib/transport/libusb1_zero_copy.cpp
@@ -22,6 +22,7 @@
 #include <boost/shared_array.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <vector>
 #include <iostream>
 
@@ -280,7 +281,6 @@ libusb_transfer *usb_endpoint::get_lut_with_wait(double timeout){
  **********************************************************************/
 class libusb_zero_copy_impl : public usb_zero_copy, public boost::enable_shared_from_this<libusb_zero_copy_impl> {
 public:
-    typedef boost::shared_ptr<libusb_zero_copy_impl> sptr;
 
     libusb_zero_copy_impl(
         libusb::device_handle::sptr handle,
@@ -335,10 +335,6 @@ libusb_zero_copy_impl::libusb_zero_copy_impl(
     if (send_xfer_size == 0) send_xfer_size = DEFAULT_XFER_SIZE;
     if (send_num_xfers == 0) send_num_xfers = DEFAULT_NUM_XFERS;
 
-    //sanity check the transfer sizes
-    UHD_ASSERT_THROW(recv_xfer_size % 512 == 0);
-    UHD_ASSERT_THROW(send_xfer_size % 512 == 0);
-
     //store the num xfers for the num frames count
     _recv_xfer_size = recv_xfer_size;
     _recv_num_frames = recv_num_xfers;
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp
index 2cf7bde18..e9d91fe45 100644
--- a/host/lib/transport/udp_zero_copy_asio.cpp
+++ b/host/lib/transport/udp_zero_copy_asio.cpp
@@ -25,6 +25,7 @@
 #include <boost/asio.hpp>
 #include <boost/format.hpp>
 #include <boost/thread.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <iostream>
 
 using namespace uhd;