From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 4 Jan 2016 17:31:40 +0000 (+0200)
Subject: Replace rapidjson includes with json11
X-Git-Tag: dnsdist-1.0.0-alpha2~36^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93278d2adecff4c2389e3580ab84c9a598306903;p=pdns

Replace rapidjson includes with json11
---

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 8338e72d8..5cd8878e0 100644
--- 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 3631a45cf..db18969fb 100644
--- 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 26100134d..52934fa5e 100644
--- 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 5fd433123..a7ccefb0c 100644
--- 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 296753882..13cf43d80 100644
--- 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 10a7c97fc..31294c7c5 100644
--- 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 e1e9a5894..a382c0092 100644
--- 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 a5d394085..8549c1fea 100644
--- 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 b5467337c..dcbec3393 100644
--- 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 38ab1d8e4..d8f8243fd 100644
--- 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 06efcd8d0..daabd5055 100644
--- 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 b10d5880c..884102fc6 100644
--- 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 189802044..aaa17e869 100644
--- 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;