diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2015-04-20 14:32:28 -0400 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-04-21 11:56:51 -0700 |
| commit | a9b6141d7c5f46fd85a629c568ff0e8ebd46ec24 (patch) | |
| tree | e17dcdfeffc64b52e7ebed3afd012de8f85a33e2 | |
| parent | 73d42182be1b84943dfa0569d3cb2d0a5b21e2ff (diff) | |
| download | uhd-a9b6141d7c5f46fd85a629c568ff0e8ebd46ec24.tar.gz uhd-a9b6141d7c5f46fd85a629c568ff0e8ebd46ec24.tar.bz2 uhd-a9b6141d7c5f46fd85a629c568ff0e8ebd46ec24.zip | |
b200: Boost 1.58-related fixes in B200 IO code.
When returning an invalid payload in handle_async_task, Boost 1.58
does not allow NULL to be returned; instead, to be more compatible,
use the correct type initialized to (0, []).
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index d6df726af..eb7bbe048 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -300,7 +300,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task( { managed_recv_buffer::sptr buff = xport->get_recv_buff(); if (not buff or buff->size() < 8) - return NULL; + return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t()); const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]); switch (sid) { @@ -364,7 +364,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task( default: UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl; } - return NULL; + return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t()); } /*********************************************************************** |