From e1c754f2069ce5ee4914ea312e62fc3f708ff824 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 6 Apr 2017 16:45:40 -0700 Subject: transport: Fix some nullptr vs NULL vs 0 This affects some versions of Clang when using C++11 features. --- host/lib/transport/zero_copy_flow_ctrl.cpp | 4 ++-- host/lib/usrp/device3/device3_io_impl.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'host/lib') diff --git a/host/lib/transport/zero_copy_flow_ctrl.cpp b/host/lib/transport/zero_copy_flow_ctrl.cpp index 736390f3c..ef8f5c9d1 100644 --- a/host/lib/transport/zero_copy_flow_ctrl.cpp +++ b/host/lib/transport/zero_copy_flow_ctrl.cpp @@ -37,7 +37,7 @@ public: zero_copy_flow_ctrl_msb( flow_ctrl_func flow_ctrl ) : - _mb(NULL), + _mb(nullptr), _flow_ctrl(flow_ctrl) { /* NOP */ @@ -75,7 +75,7 @@ public: zero_copy_flow_ctrl_mrb( flow_ctrl_func flow_ctrl ) : - _mb(NULL), + _mb(nullptr), _flow_ctrl(flow_ctrl) { /* NOP */ diff --git a/host/lib/usrp/device3/device3_io_impl.cpp b/host/lib/usrp/device3/device3_io_impl.cpp index 46cc0ee5a..27c31f17b 100644 --- a/host/lib/usrp/device3/device3_io_impl.cpp +++ b/host/lib/usrp/device3/device3_io_impl.cpp @@ -860,7 +860,8 @@ tx_streamer::sptr device3_impl::get_tx_stream(const uhd::stream_args_t &args_) xport.send = zero_copy_flow_ctrl::make( xport.send, boost::bind(&tx_flow_ctrl, task, fc_cache, fc_window, _1), - NULL); + 0 + ); //Give the streamer a functor to get the send buffer //get_tx_buff is static so bind has no lifetime issues -- cgit v1.2.3