[pkgsrc/trunk]: pkgsrc/ham/uhd Don't use ambigious NULL to mean a missing value.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d719722285af
branches:  trunk
changeset: 650510:d719722285af
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 23 18:26:30 2015 +0000

description:
Don't use ambigious NULL to mean a missing value.

diffstat:

 ham/uhd/distinfo                                       |   3 +-
 ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp |  22 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r fb01ee47fe81 -r d719722285af ham/uhd/distinfo
--- a/ham/uhd/distinfo  Thu Apr 23 18:25:15 2015 +0000
+++ b/ham/uhd/distinfo  Thu Apr 23 18:26:30 2015 +0000
@@ -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 -r fb01ee47fe81 -r d719722285af ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/ham/uhd/patches/patch-lib_usrp_b200_b200__io__impl.cpp    Thu Apr 23 18:26:30 2015 +0000
@@ -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;
+ }
+ 
+ /***********************************************************************