diff options
| author | Josh Blum <josh@joshknows.com> | 2012-08-31 11:20:17 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-08-31 11:20:17 -0700 |
| commit | 667dcf0b98bb5a99654cf883fb97d2a549582cff (patch) | |
| tree | 7c845d7ac3f506c000ab495b1d62d976b816b5cd /host/lib/transport/usb_zero_copy_wrapper.cpp | |
| parent | 05a06254a7f0149425bdda0e5544507bd35a671b (diff) | |
| parent | 36a7def9aa6cecaa6f3cbf9979544d6fd5848a08 (diff) | |
| download | uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.tar.gz uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.tar.bz2 uhd-667dcf0b98bb5a99654cf883fb97d2a549582cff.zip | |
Merge branch 'next'
Diffstat (limited to 'host/lib/transport/usb_zero_copy_wrapper.cpp')
| -rw-r--r-- | host/lib/transport/usb_zero_copy_wrapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/lib/transport/usb_zero_copy_wrapper.cpp b/host/lib/transport/usb_zero_copy_wrapper.cpp index d59ea36ff..d04244ca9 100644 --- a/host/lib/transport/usb_zero_copy_wrapper.cpp +++ b/host/lib/transport/usb_zero_copy_wrapper.cpp @@ -15,12 +15,12 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#include "simple_claimer.hpp" #include <uhd/transport/usb_zero_copy.hpp> #include <uhd/transport/buffer_pool.hpp> #include <uhd/utils/byteswap.hpp> #include <uhd/utils/msg.hpp> #include <uhd/utils/tasks.hpp> +#include <uhd/utils/atomic.hpp> #include <boost/foreach.hpp> #include <boost/make_shared.hpp> #include <boost/thread/mutex.hpp> @@ -29,6 +29,7 @@ #include <vector> #include <iostream> +using namespace uhd; using namespace uhd::transport; static const boost::posix_time::time_duration AUTOFLUSH_TIMEOUT(boost::posix_time::milliseconds(1)); |