Put json in its own module with header

src/cpp/ripple/AccountState.h

@@ -9,8 +9,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "../json/value.h"
-
 #include "RippleAddress.h"
 #include "SerializedLedger.h"
 

src/cpp/ripple/CallRPC.cpp

@@ -20,9 +20,6 @@
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 
-#include "../json/value.h"
-#include "../json/reader.h"
-
 #include "Application.h"
 #include "RPC.h"
 #include "Log.h"

src/cpp/ripple/CallRPC.h

@@ -3,8 +3,6 @@
 
 #include <string>
 
-#include "../json/value.h"
-
 class RPCParser
 {
 protected:

src/cpp/ripple/Config.h

@@ -10,8 +10,6 @@
 #include "ParseSection.h"
 #include "SerializedTypes.h"
 
-#include "../json/value.h"
-
 #define ENABLE_INSECURE				0				// 1, to enable unnecessary features.
 
 #define SYSTEM_NAME					"ripple"

src/cpp/ripple/FeatureTable.h

@@ -5,8 +5,6 @@
 #include <boost/unordered_set.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include "../json/value.h"
-
 #include "Ledger.h"
 
 class FeatureSet

src/cpp/ripple/JobQueue.h

@@ -11,8 +11,6 @@
 #include <boost/asio.hpp>
 #include <boost/ref.hpp>
 
-#include "../json/value.h"
-
 #include "LoadMonitor.h"
 
 // Note that this queue should only be used for CPU-bound jobs

src/cpp/ripple/Ledger.h

@@ -8,8 +8,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
-#include "../json/value.h"
-
 #include "Transaction.h"
 #include "TransactionMeta.h"
 #include "AccountState.h"

src/cpp/ripple/LedgerConsensus.h

@@ -8,8 +8,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "../json/value.h"
-
 #include "key.h"
 #include "Transaction.h"
 #include "LedgerAcquire.h"

src/cpp/ripple/LedgerProposal.h

@@ -6,8 +6,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "../json/value.h"
-
 #include "RippleAddress.h"
 #include "Serializer.h"
 #include "InstanceCounter.h"

src/cpp/ripple/LoadManager.h

@@ -5,8 +5,6 @@
 
 #include <boost/thread/mutex.hpp>
 
-#include "../json/value.h"
-
 
 extern int upTime();
 

src/cpp/ripple/Log.h

@@ -18,9 +18,6 @@ namespace boost {
 */
 #include <boost/filesystem.hpp> // unfortunately needed to compile
 
-// Ensure that we don't get value.h without writer.h
-#include "../json/json.h"
-
 enum LogSeverity
 {
 	lsINVALID	= -1,	// used to indicate an invalid severity

src/cpp/ripple/PFRequest.h

@@ -9,8 +9,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-#include "../json/value.h"
-
 #include "uint256.h"
 #include "RippleAddress.h"
 #include "SerializedTypes.h"

src/cpp/ripple/ParameterTable.h

@@ -7,8 +7,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-#include "../json/value.h"
-
 class Parameter : public boost::enable_shared_from_this<Parameter>
 { // abstract base class parameters are derived from
 public:

src/cpp/ripple/Peer.cpp

@@ -5,8 +5,6 @@
 #include <boost/make_shared.hpp>
 #include <boost/ref.hpp>
 
-#include "../json/writer.h"
-
 #include "Version.h"
 #include "Peer.h"
 #include "Config.h"

src/cpp/ripple/RPC.h

@@ -4,8 +4,6 @@
 #include <string>
 #include <map>
 
-#include "../json/value.h"
-
 enum http_status_type
 {
 	ok = 200,

src/cpp/ripple/RPCErr.cpp

@@ -4,8 +4,6 @@
 #include "RPCErr.h"
 #include "utils.h"
 
-#include "../json/writer.h"
-
 // For logging
 struct RPCErr { };
 

src/cpp/ripple/RPCErr.h

@@ -1,8 +1,6 @@
 #ifndef __RPCERR__
 #define __RPCERR__
 
-#include "../json/value.h"
-
 enum {
 	rpcSUCCESS = 0,
 	rpcBAD_SYNTAX,	// Must be 1 to print usage to command line.

src/cpp/ripple/RPCHandler.h

@@ -3,8 +3,6 @@
 
 #include <boost/unordered_set.hpp>
 
-#include "../json/value.h"
-
 #include "RippleAddress.h"
 #include "SerializedTypes.h"
 #include "Ledger.h"

src/cpp/ripple/RPCServer.cpp

@@ -14,9 +14,6 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/asio/read_until.hpp>
 
-#include "../json/reader.h"
-#include "../json/writer.h"
-
 #ifndef RPC_MAXIMUM_QUERY
 #define RPC_MAXIMUM_QUERY	(1024*1024)
 #endif

src/cpp/ripple/RPCServer.h

@@ -6,8 +6,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/asio.hpp>
 
-#include "../json/value.h"
-
 #include "HTTPRequest.h"
 #include "RippleAddress.h"
 #include "NetworkOPs.h"

src/cpp/ripple/RPCSub.h

@@ -3,8 +3,6 @@
 
 #include <deque>
 
-#include "../json/value.h"
-
 #include "NetworkOPs.h"
 
 #define RPC_EVENT_QUEUE_MAX	32

src/cpp/ripple/SerializedObject.h

@@ -5,8 +5,6 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include "../json/value.h"
-
 #include "SerializedTypes.h"
 #include "InstanceCounter.h"
 

src/cpp/ripple/SerializedTypes.h

@@ -4,8 +4,6 @@
 #include <vector>
 #include <string>
 
-#include "../json/value.h"
-
 #include "uint256.h"
 #include "Serializer.h"
 #include "FieldNames.h"

src/cpp/ripple/Transaction.h

@@ -11,8 +11,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/cstdint.hpp>
 
-#include "../json/value.h"
-
 #include "key.h"
 #include "uint256.h"
 #include "ripple.pb.h"

src/cpp/ripple/TransactionMeta.h

@@ -6,8 +6,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
-#include "../json/value.h"
-
 #include "uint256.h"
 #include "Serializer.h"
 #include "SerializedTypes.h"

src/cpp/ripple/UniqueNodeList.h

@@ -8,8 +8,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>
 
-#include "../json/value.h"
-
 #include "RippleAddress.h"
 #include "Config.h"
 #include "HttpsClient.h"

src/cpp/ripple/WSConnection.h

@@ -2,8 +2,6 @@
 #include "../websocketpp/src/sockets/autotls.hpp"
 #include "../websocketpp/src/websocketpp.hpp"
 
-#include "../json/value.h"
-
 #include <boost/weak_ptr.hpp>
 #include <boost/asio.hpp>
 #include <boost/enable_shared_from_this.hpp>

src/cpp/ripple/Wallet.h

@@ -12,8 +12,6 @@
 #include "openssl/ec.h"
 #include "openssl/dh.h"
 
-#include "../json/value.h"
-
 #include "uint256.h"
 #include "Serializer.h"
 

src/cpp/ripple/rpc.cpp

@@ -8,9 +8,6 @@
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 
-#include "../json/value.h"
-#include "../json/writer.h"
-
 #include "RPC.h"
 #include "BitcoinUtil.h"
 #include "Config.h"