CVS commit: pkgsrc/net/dnsdist

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon May 22 23:41:22 UTC 2017

Modified Files:
        pkgsrc/net/dnsdist: distinfo
Added Files:
        pkgsrc/net/dnsdist/patches: patch-ext_json11_json11.cpp

Log Message:
Don't try to order null pointers.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/dnsdist/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/dnsdist/patches/patch-ext_json11_json11.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/dnsdist/distinfo
diff -u pkgsrc/net/dnsdist/distinfo:1.1 pkgsrc/net/dnsdist/distinfo:1.2
--- pkgsrc/net/dnsdist/distinfo:1.1     Fri Mar 31 20:49:51 2017
+++ pkgsrc/net/dnsdist/distinfo Mon May 22 23:41:22 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2017/03/31 20:49:51 fhajny Exp $
+$NetBSD: distinfo,v 1.2 2017/05/22 23:41:22 joerg Exp $
 
 SHA1 (dnsdist-1.1.0.tar.bz2) = 9b6372fc5f606ee83dac465e1dc9c824242f5905
 RMD160 (dnsdist-1.1.0.tar.bz2) = 7724641b2be1c3611dd0b2c685cf6e8b7a365e67
@@ -7,5 +7,6 @@ Size (dnsdist-1.1.0.tar.bz2) = 874837 by
 SHA1 (patch-dns.hh) = 13834e3d9f48b3095ce4912540c7d0d275c3a3a3
 SHA1 (patch-dnsdist-console.cc) = 51fee0e89b648e0f9c2e6c0d9a6859ef2991a1b7
 SHA1 (patch-dnsdist.cc) = 2b2bf569c134019dd8a5d4f3df104fdd16a47a31
+SHA1 (patch-ext_json11_json11.cpp) = 9fb12578d80103b8b92e984a483cbda98fd83db8
 SHA1 (patch-iputils.hh) = 666fe81cc651b2c7e85164b8246283e301bcce1a
 SHA1 (patch-qtype.hh) = 4551be1e303a31d34030c363849398923f5ff987

Added files:

Index: pkgsrc/net/dnsdist/patches/patch-ext_json11_json11.cpp
diff -u /dev/null pkgsrc/net/dnsdist/patches/patch-ext_json11_json11.cpp:1.1
--- /dev/null   Mon May 22 23:41:22 2017
+++ pkgsrc/net/dnsdist/patches/patch-ext_json11_json11.cpp      Mon May 22 23:41:22 2017
@@ -0,0 +1,30 @@
+$NetBSD: patch-ext_json11_json11.cpp,v 1.1 2017/05/22 23:41:22 joerg Exp $
+
+Clang rejects ordering relations for nullptr, so introduce a template
+indirection.
+
+--- ext/json11/json11.cpp.orig 2016-12-29 12:45:46.000000000 +0000
++++ ext/json11/json11.cpp
+@@ -132,6 +132,13 @@ void Json::dump(string &out) const {
+  * Value wrappers
+  */
+ 
++template <typename T> bool json11_less(T a, T b) {
++  return a < b;
++}
++template <> bool json11_less(const std::nullptr_t a, const std::nullptr_t b) {
++  return false;
++}
++
+ template <Json::Type tag, typename T>
+ class Value : public JsonValue {
+ protected:
+@@ -150,7 +157,7 @@ protected:
+         return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
+     }
+     bool less(const JsonValue * other) const override {
+-        return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
++        return json11_less(m_value, static_cast<const Value<tag, T> *>(other)->m_value);
+     }
+ 
+     const T m_value;