diff options
author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-20 19:38:56 +0000 |
---|---|---|
committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-01-20 19:38:56 +0000 |
commit | 28fd6f320bbc8fededc8e4803989858c07967ba6 (patch) | |
tree | 9d05cb254c98156a4223c366550eca44369cb054 /dns/powerdns/files | |
parent | 64129ffe3d1ea330405becdcfa1136f116c7af79 (diff) | |
download | ports-28fd6f320bbc8fededc8e4803989858c07967ba6.tar.gz ports-28fd6f320bbc8fededc8e4803989858c07967ba6.zip |
Notes
Diffstat (limited to 'dns/powerdns/files')
-rw-r--r-- | dns/powerdns/files/patch-ext_json11_json11.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/dns/powerdns/files/patch-ext_json11_json11.cpp b/dns/powerdns/files/patch-ext_json11_json11.cpp new file mode 100644 index 000000000000..65252fe28a63 --- /dev/null +++ b/dns/powerdns/files/patch-ext_json11_json11.cpp @@ -0,0 +1,37 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,21 @@ using std::make_shared; + using std::initializer_list; + using std::move; + ++/* Helper for representing null - just a do-nothing struct, plus comparison ++ * operators so the helpers in JsonValue work. We can't use nullptr_t because ++ * it may not be orderable. ++*/ ++ ++struct NullStruct { ++ bool operator==(NullStruct) const { return true; } ++ bool operator<(NullStruct) const { return false; } ++}; ++ + /* * * * * * * * * * * * * * * * * * * * + * Serialization + */ + +-static void dump(std::nullptr_t, string &out) { ++static void dump(NullStruct, string &out) { + out += "null"; + } + +@@ -204,9 +214,9 @@ public: + explicit JsonObject(Json::object &&value) : Value(move(value)) {} + }; + +-class JsonNull final : public Value<Json::NUL, std::nullptr_t> { ++class JsonNull final : public Value<Json::NUL, NullStruct> { + public: +- JsonNull() : Value(nullptr) {} ++ JsonNull() : Value({}) {} + }; + + /* * * * * * * * * * * * * * * * * * * * |