diff options
| author | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-09-24 15:53:03 -0700 |
| commit | 192663bcc919a794a24eabb38d12519f445b7a47 (patch) | |
| tree | ba55269010c4484bef12d4019c691d9e469165d7 /host/lib/usrp/usrp2/io_impl.cpp | |
| parent | 77cdb4a9695e71e64e1d87cfad2cb4d8717f971e (diff) | |
| parent | 5d6d25b49cc783ef012410064bc9eb0e66e50227 (diff) | |
| download | uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.gz uhd-192663bcc919a794a24eabb38d12519f445b7a47.tar.bz2 uhd-192663bcc919a794a24eabb38d12519f445b7a47.zip | |
Merge branch 'master' into usrp_e
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/usrp2/io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 4e883cf81..91a1b2344 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -189,7 +189,7 @@ bool usrp2_impl::recv_async_msg( /*********************************************************************** * Send Data **********************************************************************/ -bool get_send_buffs( +static bool get_send_buffs( const std::vector<udp_zero_copy::sptr> &trans, vrt_packet_handler::managed_send_buffs_t &buffs ){ |