diff options
| author | joerg <joerg> | 2015-04-23 18:26:30 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-04-23 18:26:30 +0000 |
| commit | 740300ed4639e68d143f2c348ae78149e46a0ffc (patch) | |
| tree | 3238d4e041f1fe4f497c8ef04c9ce395e842c854 /ham | |
| parent | 1fb6c92c2248cb020878f12daa56f4e52642c6e6 (diff) | |
| download | pkgsrc-740300ed4639e68d143f2c348ae78149e46a0ffc.tar.gz | |
Don't use ambigious NULL to mean a missing value.
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/uhd/distinfo | 3 | ||||
| -rw-r--r-- | ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/ham/uhd/distinfo b/ham/uhd/distinfo index 74264d75a9e..c1bce4a5e04 100644 --- a/ham/uhd/distinfo +++ b/ham/uhd/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2014/09/08 10:02:02 obache Exp $ +$NetBSD: distinfo,v 1.4 2015/04/23 18:26:30 joerg Exp $ SHA1 (uhd-release_003_007_002.zip) = 41e110454a7e8a7c749226f17dcf49a62c7c4da4 RMD160 (uhd-release_003_007_002.zip) = 914115d13028ff753465119848ee9d88811f127b Size (uhd-release_003_007_002.zip) = 90350334 bytes SHA1 (patch-host_include_uhd_transport_nirio_nirio__driver__iface_h) = 2ba6c50f467515bfac9fe330572bb0154154a0ad +SHA1 (patch-lib_usrp_b200_b200__io__impl.cpp) = 937003ecd88a31d96c5223c95751ace7622e2256 diff --git a/ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp b/ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp new file mode 100644 index 00000000000..24023b27d1e --- /dev/null +++ b/ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_usrp_b200_b200__io__impl.cpp,v 1.1 2015/04/23 18:26:30 joerg Exp $ + +--- lib/usrp/b200/b200_io_impl.cpp.orig 2015-04-23 14:23:25.000000000 +0000 ++++ lib/usrp/b200/b200_io_impl.cpp +@@ -184,7 +184,7 @@ boost::optional<uhd::msg_task::msg_type_ + { + managed_recv_buffer::sptr buff = xport->get_recv_buff(); + if (not buff or buff->size() < 8) +- return NULL; ++ return boost::none; + + const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]); + switch (sid) { +@@ -248,7 +248,7 @@ boost::optional<uhd::msg_task::msg_type_ + default: + UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl; + } +- return NULL; ++ return boost::none; + } + + /*********************************************************************** |