View | Details | Raw Unified | Return to bug 216071 | Differences between
and this patch

Collapse All | Expand All

(-)dns/powerdns-recursor/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	recursor
4
PORTNAME=	recursor
5
PORTVERSION=	4.0.4
5
PORTVERSION=	4.0.4
6
PORTREVISION=	1
6
CATEGORIES=	dns ipv6
7
CATEGORIES=	dns ipv6
7
MASTER_SITES=	http://downloads.powerdns.com/releases/
8
MASTER_SITES=	http://downloads.powerdns.com/releases/
8
PKGNAMEPREFIX=	powerdns-
9
PKGNAMEPREFIX=	powerdns-
(-)dns/powerdns-recursor/files/patch-ext_json11_json11.cpp (+37 lines)
Line 0 Link Here
1
--- ext/json11/json11.cpp.orig	2017-01-18 18:06:37 UTC
2
+++ ext/json11/json11.cpp
3
@@ -37,11 +37,21 @@ using std::make_shared;
4
 using std::initializer_list;
5
 using std::move;
6
 
7
+/* Helper for representing null - just a do-nothing struct, plus comparison
8
+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
9
+ * it may not be orderable.
10
+ */
11
+
12
+struct NullStruct {
13
+    bool operator==(NullStruct) const { return true; }
14
+    bool operator<(NullStruct) const { return false; }
15
+};
16
+
17
 /* * * * * * * * * * * * * * * * * * * *
18
  * Serialization
19
  */
20
 
21
-static void dump(std::nullptr_t, string &out) {
22
+static void dump(NullStruct, string &out) {
23
     out += "null";
24
 }
25
 
26
@@ -204,9 +214,9 @@ public:
27
     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
28
 };
29
 
30
-class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
31
+class JsonNull final : public Value<Json::NUL, NullStruct> {
32
 public:
33
-    JsonNull() : Value(nullptr) {}
34
+    JsonNull() : Value({}) {}
35
 };
36
 
37
 /* * * * * * * * * * * * * * * * * * * *

Return to bug 216071