From ce66f950cf4039e12efd7dfc51d59e31559df674 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sat, 25 May 2013 12:36:56 -0700 Subject: [PATCH] Put json in its own module with header --- modules/ripple_basics/ripple_basics.h | 4 +- {src/cpp => modules/ripple_json}/json/LICENSE | Bin {src/cpp => modules/ripple_json}/json/json.h | 0 .../ripple_json/json/json_autolink.h | 3 + .../ripple_json}/json/json_batchallocator.h | 0 .../ripple_json/json/json_config.h | 0 .../ripple_json/json/json_features.h | 4 +- .../ripple_json/json/json_forwards.h | 2 +- .../ripple_json}/json/json_internalarray.inl | 0 .../ripple_json}/json/json_internalmap.inl | 0 .../ripple_json}/json/json_reader.cpp | 6 +- .../ripple_json/json/json_reader.h | 13 +- .../ripple_json}/json/json_value.cpp | 4 +- .../ripple_json/json/json_value.h | 23 ++-- .../ripple_json}/json/json_valueiterator.inl | 0 .../ripple_json}/json/json_writer.cpp | 3 +- .../ripple_json/json/json_writer.h | 3 +- {src/cpp => modules/ripple_json}/json/version | 0 modules/ripple_json/ripple_json.cpp | 29 +++++ modules/ripple_json/ripple_json.h | 39 ++++++ modules/ripple_ledger/ripple_ledger.cpp | 2 - newcoin.vcxproj | 123 +++++------------- newcoin.vcxproj.filters | 114 ++++++++-------- src/cpp/json_core.cpp | 7 - src/cpp/ripple/AccountState.h | 2 - src/cpp/ripple/CallRPC.cpp | 3 - src/cpp/ripple/CallRPC.h | 2 - src/cpp/ripple/Config.h | 2 - src/cpp/ripple/FeatureTable.h | 2 - src/cpp/ripple/JobQueue.h | 2 - src/cpp/ripple/Ledger.h | 2 - src/cpp/ripple/LedgerConsensus.h | 2 - src/cpp/ripple/LedgerProposal.h | 2 - src/cpp/ripple/LoadManager.h | 2 - src/cpp/ripple/Log.h | 3 - src/cpp/ripple/PFRequest.h | 2 - src/cpp/ripple/ParameterTable.h | 2 - src/cpp/ripple/Peer.cpp | 2 - src/cpp/ripple/RPC.h | 2 - src/cpp/ripple/RPCErr.cpp | 2 - src/cpp/ripple/RPCErr.h | 2 - src/cpp/ripple/RPCHandler.h | 2 - src/cpp/ripple/RPCServer.cpp | 3 - src/cpp/ripple/RPCServer.h | 2 - src/cpp/ripple/RPCSub.h | 2 - src/cpp/ripple/SerializedObject.h | 2 - src/cpp/ripple/SerializedTypes.h | 2 - src/cpp/ripple/Transaction.h | 2 - src/cpp/ripple/TransactionMeta.h | 2 - src/cpp/ripple/UniqueNodeList.h | 2 - src/cpp/ripple/WSConnection.h | 2 - src/cpp/ripple/Wallet.h | 2 - src/cpp/ripple/rpc.cpp | 3 - 53 files changed, 197 insertions(+), 244 deletions(-) rename {src/cpp => modules/ripple_json}/json/LICENSE (100%) rename {src/cpp => modules/ripple_json}/json/json.h (100%) rename src/cpp/json/autolink.h => modules/ripple_json/json/json_autolink.h (86%) rename {src/cpp => modules/ripple_json}/json/json_batchallocator.h (100%) rename src/cpp/json/config.h => modules/ripple_json/json/json_config.h (100%) rename src/cpp/json/features.h => modules/ripple_json/json/json_features.h (94%) rename src/cpp/json/forwards.h => modules/ripple_json/json/json_forwards.h (96%) rename {src/cpp => modules/ripple_json}/json/json_internalarray.inl (100%) rename {src/cpp => modules/ripple_json}/json/json_internalmap.inl (100%) rename {src/cpp => modules/ripple_json}/json/json_reader.cpp (99%) rename src/cpp/json/reader.h => modules/ripple_json/json/json_reader.h (98%) rename {src/cpp => modules/ripple_json}/json/json_value.cpp (99%) rename src/cpp/json/value.h => modules/ripple_json/json/json_value.h (99%) rename {src/cpp => modules/ripple_json}/json/json_valueiterator.inl (100%) rename {src/cpp => modules/ripple_json}/json/json_writer.cpp (99%) rename src/cpp/json/writer.h => modules/ripple_json/json/json_writer.h (99%) rename {src/cpp => modules/ripple_json}/json/version (100%) create mode 100644 modules/ripple_json/ripple_json.cpp create mode 100644 modules/ripple_json/ripple_json.h delete mode 100644 src/cpp/json_core.cpp diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h index 3a08e2b442..a46536ca2d 100644 --- a/modules/ripple_basics/ripple_basics.h +++ b/modules/ripple_basics/ripple_basics.h @@ -39,10 +39,10 @@ #include #include +#include "../ripple_json/ripple_json.h" + #include "types/ripple_IntegerTypes.h" - #include "containers/ripple_KeyCache.h" - #include "events/ripple_UptimeTimer.h" #endif diff --git a/src/cpp/json/LICENSE b/modules/ripple_json/json/LICENSE similarity index 100% rename from src/cpp/json/LICENSE rename to modules/ripple_json/json/LICENSE diff --git a/src/cpp/json/json.h b/modules/ripple_json/json/json.h similarity index 100% rename from src/cpp/json/json.h rename to modules/ripple_json/json/json.h diff --git a/src/cpp/json/autolink.h b/modules/ripple_json/json/json_autolink.h similarity index 86% rename from src/cpp/json/autolink.h rename to modules/ripple_json/json/json_autolink.h index 37c9258ed5..dc79d0647b 100644 --- a/src/cpp/json/autolink.h +++ b/modules/ripple_json/json/json_autolink.h @@ -1,6 +1,9 @@ #ifndef JSON_AUTOLINK_H_INCLUDED # define JSON_AUTOLINK_H_INCLUDED +// VFALCO: TODO, remove this file +#error This file is deprecated! + # include "config.h" # ifdef JSON_IN_CPPTL diff --git a/src/cpp/json/json_batchallocator.h b/modules/ripple_json/json/json_batchallocator.h similarity index 100% rename from src/cpp/json/json_batchallocator.h rename to modules/ripple_json/json/json_batchallocator.h diff --git a/src/cpp/json/config.h b/modules/ripple_json/json/json_config.h similarity index 100% rename from src/cpp/json/config.h rename to modules/ripple_json/json/json_config.h diff --git a/src/cpp/json/features.h b/modules/ripple_json/json/json_features.h similarity index 94% rename from src/cpp/json/features.h rename to modules/ripple_json/json/json_features.h index 5a9adec118..5e4a6df8f5 100644 --- a/src/cpp/json/features.h +++ b/modules/ripple_json/json/json_features.h @@ -1,7 +1,7 @@ #ifndef CPPTL_JSON_FEATURES_H_INCLUDED -# define CPPTL_JSON_FEATURES_H_INCLUDED +#define CPPTL_JSON_FEATURES_H_INCLUDED -# include "forwards.h" +#include "json_forwards.h" namespace Json { diff --git a/src/cpp/json/forwards.h b/modules/ripple_json/json/json_forwards.h similarity index 96% rename from src/cpp/json/forwards.h rename to modules/ripple_json/json/json_forwards.h index d0ce8300ce..c9141edc1b 100644 --- a/src/cpp/json/forwards.h +++ b/modules/ripple_json/json/json_forwards.h @@ -1,7 +1,7 @@ #ifndef JSON_FORWARDS_H_INCLUDED # define JSON_FORWARDS_H_INCLUDED -# include "config.h" +# include "json_config.h" namespace Json { diff --git a/src/cpp/json/json_internalarray.inl b/modules/ripple_json/json/json_internalarray.inl similarity index 100% rename from src/cpp/json/json_internalarray.inl rename to modules/ripple_json/json/json_internalarray.inl diff --git a/src/cpp/json/json_internalmap.inl b/modules/ripple_json/json/json_internalmap.inl similarity index 100% rename from src/cpp/json/json_internalmap.inl rename to modules/ripple_json/json/json_internalmap.inl diff --git a/src/cpp/json/json_reader.cpp b/modules/ripple_json/json/json_reader.cpp similarity index 99% rename from src/cpp/json/json_reader.cpp rename to modules/ripple_json/json/json_reader.cpp index cff2ed3843..e43ec107ab 100644 --- a/src/cpp/json/json_reader.cpp +++ b/modules/ripple_json/json/json_reader.cpp @@ -1,5 +1,7 @@ -#include "reader.h" -#include "value.h" + +#include "json_reader.h" +#include "json_value.h" + #include #include #include diff --git a/src/cpp/json/reader.h b/modules/ripple_json/json/json_reader.h similarity index 98% rename from src/cpp/json/reader.h rename to modules/ripple_json/json/json_reader.h index ee1d6a2444..a4dc4c58d9 100644 --- a/src/cpp/json/reader.h +++ b/modules/ripple_json/json/json_reader.h @@ -1,12 +1,13 @@ #ifndef CPPTL_JSON_READER_H_INCLUDED # define CPPTL_JSON_READER_H_INCLUDED -# include "features.h" -# include "value.h" -# include -# include -# include -# include +#include "json_features.h" +#include "json_value.h" + +#include +#include +#include +#include namespace Json { diff --git a/src/cpp/json/json_value.cpp b/modules/ripple_json/json/json_value.cpp similarity index 99% rename from src/cpp/json/json_value.cpp rename to modules/ripple_json/json/json_value.cpp index 63b48020e6..49dc2d9bd9 100644 --- a/src/cpp/json/json_value.cpp +++ b/modules/ripple_json/json/json_value.cpp @@ -1,6 +1,6 @@ #include -#include "value.h" -#include "writer.h" +#include "json_value.h" +#include "json_writer.h" #include #include #include diff --git a/src/cpp/json/value.h b/modules/ripple_json/json/json_value.h similarity index 99% rename from src/cpp/json/value.h rename to modules/ripple_json/json/json_value.h index 58bfd88e7a..d16762f342 100644 --- a/src/cpp/json/value.h +++ b/modules/ripple_json/json/json_value.h @@ -1,18 +1,19 @@ #ifndef CPPTL_JSON_H_INCLUDED # define CPPTL_JSON_H_INCLUDED -# include "forwards.h" -# include -# include +#include "json_forwards.h" -# ifndef JSON_USE_CPPTL_SMALLMAP -# include -# else -# include -# endif -# ifdef JSON_USE_CPPTL -# include -# endif +#include +#include + +#ifndef JSON_USE_CPPTL_SMALLMAP +# include +#else +# include +#endif +#ifdef JSON_USE_CPPTL +# include +#endif /** \brief JSON (JavaScript Object Notation). */ diff --git a/src/cpp/json/json_valueiterator.inl b/modules/ripple_json/json/json_valueiterator.inl similarity index 100% rename from src/cpp/json/json_valueiterator.inl rename to modules/ripple_json/json/json_valueiterator.inl diff --git a/src/cpp/json/json_writer.cpp b/modules/ripple_json/json/json_writer.cpp similarity index 99% rename from src/cpp/json/json_writer.cpp rename to modules/ripple_json/json/json_writer.cpp index 5ab619d7b7..f0ce4f67b2 100644 --- a/src/cpp/json/json_writer.cpp +++ b/modules/ripple_json/json/json_writer.cpp @@ -1,4 +1,3 @@ -#include "writer.h" #include #include #include @@ -7,6 +6,8 @@ #include #include +#include "json_writer.h" + #if _MSC_VER >= 1400 // VC++ 8.0 #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. #endif diff --git a/src/cpp/json/writer.h b/modules/ripple_json/json/json_writer.h similarity index 99% rename from src/cpp/json/writer.h rename to modules/ripple_json/json/json_writer.h index 5f4b83be41..a6b476e7f5 100644 --- a/src/cpp/json/writer.h +++ b/modules/ripple_json/json/json_writer.h @@ -1,7 +1,8 @@ #ifndef JSON_WRITER_H_INCLUDED # define JSON_WRITER_H_INCLUDED -# include "value.h" +# include "json_value.h" + # include # include # include diff --git a/src/cpp/json/version b/modules/ripple_json/json/version similarity index 100% rename from src/cpp/json/version rename to modules/ripple_json/json/version diff --git a/modules/ripple_json/ripple_json.cpp b/modules/ripple_json/ripple_json.cpp new file mode 100644 index 0000000000..a81d5fa0b1 --- /dev/null +++ b/modules/ripple_json/ripple_json.cpp @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +/* + Copyright (c) 2011-2013, OpenCoin, Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +/** Add this to get the @ref ripple_json module. + + @file ripple_json.cpp + @ingroup ripple_json +*/ + +#include "ripple_json.h" + +#include "json/json_reader.cpp" +#include "json/json_value.cpp" +#include "json/json_writer.cpp" diff --git a/modules/ripple_json/ripple_json.h b/modules/ripple_json/ripple_json.h new file mode 100644 index 0000000000..64834cea09 --- /dev/null +++ b/modules/ripple_json/ripple_json.h @@ -0,0 +1,39 @@ +//------------------------------------------------------------------------------ +/* + Copyright (c) 2011-2013, OpenCoin, Inc. + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ +//============================================================================== + +/** Include this to get the @ref ripple_json module. + + @file ripple_json.h + @ingroup ripple_json +*/ + +/** JSON parsiing and output support. + + A simple set of JSON manipulation classes. + + @defgroup ripple_json +*/ + +#ifndef RIPPLE_JSON_H +#define RIPPLE_JSON_H + +#include "json/json_reader.h" +#include "json/json_writer.h" +#include "json/json_value.h" + +#endif diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp index a55b3f5f9e..ee7c9fe4f1 100644 --- a/modules/ripple_ledger/ripple_ledger.cpp +++ b/modules/ripple_ledger/ripple_ledger.cpp @@ -64,8 +64,6 @@ #include "src/cpp/database/SqliteDatabase.h" -#include "src/cpp/json/writer.h" - // VFALCO: TODO, resolve the location of this file //#include "src/cpp/ripple/ripple.pb.h" #include "ripple.pb.h" diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 87d38df894..5895472dae 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -182,6 +182,25 @@ + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + @@ -199,25 +218,6 @@ true true - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - true true @@ -1175,66 +1175,22 @@ + + + + + + + + + + - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - true true @@ -1658,6 +1614,9 @@ + + + Document @@ -1670,24 +1629,6 @@ $(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc $(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc - - false - false - false - false - - - false - false - false - false - - - false - false - false - false - true true diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 7ad2444236..3ea7307a18 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -7,12 +7,6 @@ {60c3631e-8855-4a61-bdd3-9892d96242d5} - - {c642219d-cace-47c1-828a-58ba570da63a} - - - {ca69d54b-9228-4767-9cef-81e489621683} - {cd4c41c0-3ee6-49f8-8322-d11422b892f9} @@ -127,6 +121,15 @@ {f585ac4d-1867-4f3d-b0a2-eceae4d7e7e7} + + {9f33883e-d53d-469f-ab51-653ac3e8780b} + + + {670d727d-6c99-4893-b0bb-e620975e8b8d} + + + {e398b116-a7fa-4850-8b8e-6de95efdea4e} + @@ -159,18 +162,6 @@ 0. Third Party Code\websocket\core - - 0. Third Party Code\json - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - 0. Third Party Code\LevelDB @@ -744,6 +735,18 @@ 1. Modules\ripple_basics\events + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json + @@ -785,33 +788,6 @@ 0. Third Party Code\websocket\core - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - 0. Third Party Code\LevelDB\db @@ -1388,22 +1364,52 @@ 1. Modules\ripple_basics\types + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json\DEPRECATED + + + 1. Modules\ripple_json\json\DEPRECATED + + + 1. Modules\ripple_json + + + 1. Modules\ripple_json\json + - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - - - 0. Third Party Code\json\core - 0. Third Party Code\protobuf\protobuf + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + + + 1. Modules\ripple_json\json + diff --git a/src/cpp/json_core.cpp b/src/cpp/json_core.cpp deleted file mode 100644 index 25a399d1b0..0000000000 --- a/src/cpp/json_core.cpp +++ /dev/null @@ -1,7 +0,0 @@ - -// JSON parser unity build -// - -#include "json/json_reader.cpp" -#include "json/json_value.cpp" -#include "json/json_writer.cpp" diff --git a/src/cpp/ripple/AccountState.h b/src/cpp/ripple/AccountState.h index 0a2a750e50..eb853e8410 100644 --- a/src/cpp/ripple/AccountState.h +++ b/src/cpp/ripple/AccountState.h @@ -9,8 +9,6 @@ #include -#include "../json/value.h" - #include "RippleAddress.h" #include "SerializedLedger.h" diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp index b17c2d4f4b..3d185fb6cb 100644 --- a/src/cpp/ripple/CallRPC.cpp +++ b/src/cpp/ripple/CallRPC.cpp @@ -20,9 +20,6 @@ #include #include -#include "../json/value.h" -#include "../json/reader.h" - #include "Application.h" #include "RPC.h" #include "Log.h" diff --git a/src/cpp/ripple/CallRPC.h b/src/cpp/ripple/CallRPC.h index 01920c19ea..3ce69167a6 100644 --- a/src/cpp/ripple/CallRPC.h +++ b/src/cpp/ripple/CallRPC.h @@ -3,8 +3,6 @@ #include -#include "../json/value.h" - class RPCParser { protected: diff --git a/src/cpp/ripple/Config.h b/src/cpp/ripple/Config.h index 3f9897c5d3..8dad49423f 100644 --- a/src/cpp/ripple/Config.h +++ b/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" diff --git a/src/cpp/ripple/FeatureTable.h b/src/cpp/ripple/FeatureTable.h index d54e49f23f..9579f40195 100644 --- a/src/cpp/ripple/FeatureTable.h +++ b/src/cpp/ripple/FeatureTable.h @@ -5,8 +5,6 @@ #include #include -#include "../json/value.h" - #include "Ledger.h" class FeatureSet diff --git a/src/cpp/ripple/JobQueue.h b/src/cpp/ripple/JobQueue.h index 4bc4064631..fbce3d8cb2 100644 --- a/src/cpp/ripple/JobQueue.h +++ b/src/cpp/ripple/JobQueue.h @@ -11,8 +11,6 @@ #include #include -#include "../json/value.h" - #include "LoadMonitor.h" // Note that this queue should only be used for CPU-bound jobs diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h index b8ee4ced8f..5d8c9bfcdd 100644 --- a/src/cpp/ripple/Ledger.h +++ b/src/cpp/ripple/Ledger.h @@ -8,8 +8,6 @@ #include #include -#include "../json/value.h" - #include "Transaction.h" #include "TransactionMeta.h" #include "AccountState.h" diff --git a/src/cpp/ripple/LedgerConsensus.h b/src/cpp/ripple/LedgerConsensus.h index d09af5c750..d4864eafe5 100644 --- a/src/cpp/ripple/LedgerConsensus.h +++ b/src/cpp/ripple/LedgerConsensus.h @@ -8,8 +8,6 @@ #include #include -#include "../json/value.h" - #include "key.h" #include "Transaction.h" #include "LedgerAcquire.h" diff --git a/src/cpp/ripple/LedgerProposal.h b/src/cpp/ripple/LedgerProposal.h index c4a42f9e34..3c7b417fb0 100644 --- a/src/cpp/ripple/LedgerProposal.h +++ b/src/cpp/ripple/LedgerProposal.h @@ -6,8 +6,6 @@ #include -#include "../json/value.h" - #include "RippleAddress.h" #include "Serializer.h" #include "InstanceCounter.h" diff --git a/src/cpp/ripple/LoadManager.h b/src/cpp/ripple/LoadManager.h index 551f4b5eb9..aac5eff154 100644 --- a/src/cpp/ripple/LoadManager.h +++ b/src/cpp/ripple/LoadManager.h @@ -5,8 +5,6 @@ #include -#include "../json/value.h" - extern int upTime(); diff --git a/src/cpp/ripple/Log.h b/src/cpp/ripple/Log.h index 29c3d79650..8c3c1e2ba4 100644 --- a/src/cpp/ripple/Log.h +++ b/src/cpp/ripple/Log.h @@ -18,9 +18,6 @@ namespace boost { */ #include // 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 diff --git a/src/cpp/ripple/PFRequest.h b/src/cpp/ripple/PFRequest.h index 1e949ff916..07321011e7 100644 --- a/src/cpp/ripple/PFRequest.h +++ b/src/cpp/ripple/PFRequest.h @@ -9,8 +9,6 @@ #include #include -#include "../json/value.h" - #include "uint256.h" #include "RippleAddress.h" #include "SerializedTypes.h" diff --git a/src/cpp/ripple/ParameterTable.h b/src/cpp/ripple/ParameterTable.h index 897a8551ff..34ecf1d08f 100644 --- a/src/cpp/ripple/ParameterTable.h +++ b/src/cpp/ripple/ParameterTable.h @@ -7,8 +7,6 @@ #include #include -#include "../json/value.h" - class Parameter : public boost::enable_shared_from_this { // abstract base class parameters are derived from public: diff --git a/src/cpp/ripple/Peer.cpp b/src/cpp/ripple/Peer.cpp index fbec945252..9c1bc5faea 100644 --- a/src/cpp/ripple/Peer.cpp +++ b/src/cpp/ripple/Peer.cpp @@ -5,8 +5,6 @@ #include #include -#include "../json/writer.h" - #include "Version.h" #include "Peer.h" #include "Config.h" diff --git a/src/cpp/ripple/RPC.h b/src/cpp/ripple/RPC.h index ea180e5b1a..7612f1cf69 100644 --- a/src/cpp/ripple/RPC.h +++ b/src/cpp/ripple/RPC.h @@ -4,8 +4,6 @@ #include #include -#include "../json/value.h" - enum http_status_type { ok = 200, diff --git a/src/cpp/ripple/RPCErr.cpp b/src/cpp/ripple/RPCErr.cpp index 91b7b58d00..50371fbb3c 100644 --- a/src/cpp/ripple/RPCErr.cpp +++ b/src/cpp/ripple/RPCErr.cpp @@ -4,8 +4,6 @@ #include "RPCErr.h" #include "utils.h" -#include "../json/writer.h" - // For logging struct RPCErr { }; diff --git a/src/cpp/ripple/RPCErr.h b/src/cpp/ripple/RPCErr.h index fbfc9549fe..060e010ca0 100644 --- a/src/cpp/ripple/RPCErr.h +++ b/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. diff --git a/src/cpp/ripple/RPCHandler.h b/src/cpp/ripple/RPCHandler.h index ba9c171513..ed3fd12a21 100644 --- a/src/cpp/ripple/RPCHandler.h +++ b/src/cpp/ripple/RPCHandler.h @@ -3,8 +3,6 @@ #include -#include "../json/value.h" - #include "RippleAddress.h" #include "SerializedTypes.h" #include "Ledger.h" diff --git a/src/cpp/ripple/RPCServer.cpp b/src/cpp/ripple/RPCServer.cpp index 5aa8e24b65..814ab9bf2e 100644 --- a/src/cpp/ripple/RPCServer.cpp +++ b/src/cpp/ripple/RPCServer.cpp @@ -14,9 +14,6 @@ #include #include -#include "../json/reader.h" -#include "../json/writer.h" - #ifndef RPC_MAXIMUM_QUERY #define RPC_MAXIMUM_QUERY (1024*1024) #endif diff --git a/src/cpp/ripple/RPCServer.h b/src/cpp/ripple/RPCServer.h index 44ca235fdd..2be4c0d956 100644 --- a/src/cpp/ripple/RPCServer.h +++ b/src/cpp/ripple/RPCServer.h @@ -6,8 +6,6 @@ #include #include -#include "../json/value.h" - #include "HTTPRequest.h" #include "RippleAddress.h" #include "NetworkOPs.h" diff --git a/src/cpp/ripple/RPCSub.h b/src/cpp/ripple/RPCSub.h index cb8c94348d..91ab300ede 100644 --- a/src/cpp/ripple/RPCSub.h +++ b/src/cpp/ripple/RPCSub.h @@ -3,8 +3,6 @@ #include -#include "../json/value.h" - #include "NetworkOPs.h" #define RPC_EVENT_QUEUE_MAX 32 diff --git a/src/cpp/ripple/SerializedObject.h b/src/cpp/ripple/SerializedObject.h index c1a7fa35ec..9b28ef4b34 100644 --- a/src/cpp/ripple/SerializedObject.h +++ b/src/cpp/ripple/SerializedObject.h @@ -5,8 +5,6 @@ #include -#include "../json/value.h" - #include "SerializedTypes.h" #include "InstanceCounter.h" diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h index 7320fa9172..0d9241033d 100644 --- a/src/cpp/ripple/SerializedTypes.h +++ b/src/cpp/ripple/SerializedTypes.h @@ -4,8 +4,6 @@ #include #include -#include "../json/value.h" - #include "uint256.h" #include "Serializer.h" #include "FieldNames.h" diff --git a/src/cpp/ripple/Transaction.h b/src/cpp/ripple/Transaction.h index cc4a4bc77b..2ba693766c 100644 --- a/src/cpp/ripple/Transaction.h +++ b/src/cpp/ripple/Transaction.h @@ -11,8 +11,6 @@ #include #include -#include "../json/value.h" - #include "key.h" #include "uint256.h" #include "ripple.pb.h" diff --git a/src/cpp/ripple/TransactionMeta.h b/src/cpp/ripple/TransactionMeta.h index 4728daedc1..1da6a3728d 100644 --- a/src/cpp/ripple/TransactionMeta.h +++ b/src/cpp/ripple/TransactionMeta.h @@ -6,8 +6,6 @@ #include #include -#include "../json/value.h" - #include "uint256.h" #include "Serializer.h" #include "SerializedTypes.h" diff --git a/src/cpp/ripple/UniqueNodeList.h b/src/cpp/ripple/UniqueNodeList.h index bfd0af8006..0604d315b0 100644 --- a/src/cpp/ripple/UniqueNodeList.h +++ b/src/cpp/ripple/UniqueNodeList.h @@ -8,8 +8,6 @@ #include #include -#include "../json/value.h" - #include "RippleAddress.h" #include "Config.h" #include "HttpsClient.h" diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h index 7f4ca48b18..3f94f0775f 100644 --- a/src/cpp/ripple/WSConnection.h +++ b/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 #include #include diff --git a/src/cpp/ripple/Wallet.h b/src/cpp/ripple/Wallet.h index 5f9a06004a..68cb106096 100644 --- a/src/cpp/ripple/Wallet.h +++ b/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" diff --git a/src/cpp/ripple/rpc.cpp b/src/cpp/ripple/rpc.cpp index 92b98602be..c19e95e75d 100644 --- a/src/cpp/ripple/rpc.cpp +++ b/src/cpp/ripple/rpc.cpp @@ -8,9 +8,6 @@ #include #include -#include "../json/value.h" -#include "../json/writer.h" - #include "RPC.h" #include "BitcoinUtil.h" #include "Config.h"