diff options
| author |   Martin Braun <martin.braun@ettus.com> | 2019-01-18 11:41:13 -0800 |
|---|---|---|
| committer |   Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-22 18:16:59 -0800 |
| commit | 5f3058e401bcd15143fd1015f62087f662db1384 (patch) | |
| tree | b40ac4cf754247142b2657d630a281efd2158169 | |
| parent | cmake: Extend list of additional Boost versions (diff) | |
| download | uhd-5f3058e401bcd15143fd1015f62087f662db1384.tar.xz uhd-5f3058e401bcd15143fd1015f62087f662db1384.zip | |
device3: Replace NULL with 0 for empty function pointers
Technically, nullptr should be the correct replacement, but some
compilers have issues with that. This is a continuation of e1c754f20.
| -rw-r--r-- | host/lib/usrp/device3/device3_io_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/device3/device3_io_impl.cpp b/host/lib/usrp/device3/device3_io_impl.cpp index c0f91368d..bf527e0ba 100644 --- a/host/lib/usrp/device3/device3_io_impl.cpp +++ b/host/lib/usrp/device3/device3_io_impl.cpp @@ -378,7 +378,7 @@ rx_streamer::sptr device3_impl::get_rx_stream(const stream_args_t& args_) fc_cache->unpack = vrt::chdr::if_hdr_unpack_le; } xport.recv = zero_copy_flow_ctrl::make( - xport.recv, NULL, [fc_cache](managed_buffer::sptr buff) { + xport.recv, 0, [fc_cache](managed_buffer::sptr buff) { return rx_flow_ctrl(fc_cache, buff); }); @@ -614,7 +614,7 @@ tx_streamer::sptr device3_impl::get_tx_stream(const uhd::stream_args_t& args_) [fc_cache, xport](managed_buffer::sptr buff) { return tx_flow_ctrl(fc_cache, xport.recv, buff); }, - NULL); + 0); // Configure return path for async messages blk_ctrl->sr_write( |