Replace rapidjson includes with json11

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 8338e72d834a835c893e543a64b8dd3b3d050305..5cd8878e0a72dbc4069582f52ecdbbdc8a6ed2e8 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS += \
-       -I$(top_srcdir)/ext/rapidjson/include \
+       -I$(top_srcdir)/ext/json11 \
        $(YAHTTP_CFLAGS) \
        $(MBEDTLS_CFLAGS) \
        $(LIBZMQ_CFLAGS)

diff --git a/modules/remotebackend/httpconnector.cc b/modules/remotebackend/httpconnector.cc
index 3631a45cfc9c94eb991037686d7187f58d8befa3..db18969fbaf4f263fb1a833b7a0f1d06ebdd4990 100644 (file)
--- a/modules/remotebackend/httpconnector.cc
+++ b/modules/remotebackend/httpconnector.cc
@@ -7,8 +7,6 @@
 #include <fcntl.h>
 
 #include <sstream>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 #include "pdns/lock.hh"
 
 #ifndef UNIX_PATH_MAX

diff --git a/modules/remotebackend/pipeconnector.cc b/modules/remotebackend/pipeconnector.cc
index 26100134d59ecd9df68535529e3febb22a2aed30..52934fa5ec6feed6a0863a041c5e1adacf65b9dd 100644 (file)
--- a/modules/remotebackend/pipeconnector.cc
+++ b/modules/remotebackend/pipeconnector.cc
@@ -4,8 +4,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sstream>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 #include "remotebackend.hh"
 
 PipeConnector::PipeConnector(std::map<std::string,std::string> options) {

diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh
index 5fd433123b7ecd6f197c7fc5095d9f7bc1896f30..a7ccefb0c79506de314536f4cce6da15455bfd1a 100644 (file)
--- a/modules/remotebackend/remotebackend.hh
+++ b/modules/remotebackend/remotebackend.hh
@@ -11,8 +11,7 @@
 #include "pdns/pdnsexception.hh"
 #include "pdns/sstuff.hh"
 #include "pdns/ueberbackend.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "yahttp/yahttp.hpp"
 #include <sstream>
 

diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index 29675388244d6bfd9d15f55194e8dc45f616852b..13cf43d8066ce4156c5fb42f9dd24241eddfddd9 100644 (file)
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -9,8 +9,7 @@
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index 10a7c97fcd439cecf96bfbe171ecd0267ebb9ca5..31294c7c50a03fd6693baa4518b0bed3a5e22181 100644 (file)
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -9,8 +9,7 @@
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc
index e1e9a58943b6aa699739c589dbf940fe13f03003..a382c0092e94b07e1cc838edf46a7c6318c2e452 100644 (file)
--- a/modules/remotebackend/test-remotebackend-pipe.cc
+++ b/modules/remotebackend/test-remotebackend-pipe.cc
@@ -18,8 +18,7 @@
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index a5d3940855f3f9d2594c693de37b87b22b1c10fe..8549c1fea95b71a348a7ba18b83dcf36d40cce68 100644 (file)
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -9,8 +9,7 @@
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc
index b5467337c343c2eeda1e46c1648c848cf7670abb..dcbec339302973f8d96a48e267a931f890fecff3 100644 (file)
--- a/modules/remotebackend/test-remotebackend-unix.cc
+++ b/modules/remotebackend/test-remotebackend-unix.cc
@@ -18,8 +18,7 @@
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc
index 38ab1d8e447efbac47b5f1e3ef51e0032a97e06d..d8f8243fd10730bb578c387acc80732505d63755 100644 (file)
--- a/modules/remotebackend/test-remotebackend-zeromq.cc
+++ b/modules/remotebackend/test-remotebackend-zeromq.cc
@@ -17,8 +17,7 @@
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
 #include "pdns/dnsrecords.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc
index 06efcd8d0a717c0986a00fce10541f9458b59d7a..daabd505514a9726426d5bb39a3fbd05d5612ac4 100644 (file)
--- a/modules/remotebackend/test-remotebackend.cc
+++ b/modules/remotebackend/test-remotebackend.cc
@@ -16,8 +16,7 @@
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/arguments.hh"
-#include <rapidjson/rapidjson.h>
-#include <rapidjson/document.h>
+#include "pdns/json.hh"
 #include "pdns/statbag.hh"
 #include "pdns/packetcache.hh"
 

diff --git a/modules/remotebackend/unixconnector.cc b/modules/remotebackend/unixconnector.cc
index b10d5880c64b01cf441f7dbc1115fbe63f8ef7e1..884102fc69fa8010ca0233fac7a2c303a8b69bf2 100644 (file)
--- a/modules/remotebackend/unixconnector.cc
+++ b/modules/remotebackend/unixconnector.cc
@@ -4,8 +4,6 @@
 #include "remotebackend.hh"
 #include <sys/socket.h>
 #include <sstream>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 #include "pdns/lock.hh" 
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/modules/remotebackend/zmqconnector.cc b/modules/remotebackend/zmqconnector.cc
index 18980204422db6781f3e75fea4b1436b37a09b02..aaa17e869224228f37942504adbf11176f8a5d8d 100644 (file)
--- a/modules/remotebackend/zmqconnector.cc
+++ b/modules/remotebackend/zmqconnector.cc
@@ -9,8 +9,6 @@
 #include <fcntl.h>
 
 #include <sstream>
-#include <rapidjson/stringbuffer.h>
-#include <rapidjson/writer.h>
 
 ZeroMQConnector::ZeroMQConnector(std::map<std::string,std::string> options) {
   rapidjson::Value val;