From 98b630d8db0635d962645d5efc688107bd2828f6 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sat, 31 Aug 2013 16:17:26 -0700 Subject: [PATCH] Consolidate ripple_app includes --- Builds/VisualStudio2012/RippleD.vcxproj | 7 +++- modules/ripple_app/ripple_app.cpp | 46 ++++++++++++++++++++++--- modules/ripple_app/ripple_app.h | 11 +++--- modules/ripple_app/ripple_app_pt1.cpp | 36 ------------------- modules/ripple_app/ripple_app_pt3.cpp | 1 - modules/ripple_app/ripple_app_pt4.cpp | 2 ++ modules/ripple_app/ripple_app_pt5.cpp | 1 + modules/ripple_app/ripple_app_pt8.cpp | 25 ++++++-------- modules/ripple_basics/ripple_basics.h | 3 +- modules/ripple_client/ripple_client.cpp | 10 ++++++ modules/ripple_client/ripple_client.h | 17 +++++++++ modules/ripple_net/ripple_net.cpp | 3 +- 12 files changed, 96 insertions(+), 66 deletions(-) diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index db16a401db..f80d2d0d79 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -769,7 +769,12 @@ true true - + + false + false + false + false + true true diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index a7b9f1eb72..84f24b3735 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -8,10 +8,16 @@ #include "ripple_app.h" -// This file should only hold the Application object .cpp. It depends on -// everything else. Nothing else should depend on the Application -// implementation (although they will depend on its abstract interface) -// +#include "../ripple_client/ripple_client.h" +#include "../ripple_net/ripple_net.h" // for RPCServerHandler + +#include "beast/modules/beast_db/beast_db.h" +#include "../ripple_mdb/ripple_mdb.h" +#include "../ripple_leveldb/ripple_leveldb.h" +#include "../ripple_hyperleveldb/ripple_hyperleveldb.h" + +// This .cpp will end up including all of the public header +// material in Ripple since it holds the Application object. namespace ripple { @@ -19,6 +25,11 @@ namespace ripple #include "boost/ripple_IoService.h" // deprecated #include "boost/ripple_IoService.cpp" // deprecated + #include "main/ripple_FatalErrorReporter.h" +#include "main/ripple_FatalErrorReporter.cpp" + +# include "basics/ripple_RPCServerHandler.h" +#include "basics/ripple_RPCServerHandler.cpp" #ifdef _MSC_VER # pragma warning (push) # pragma warning (disable: 4244) // conversion, possible loss of data @@ -29,4 +40,31 @@ namespace ripple # pragma warning (pop) #endif +# include "node/ripple_HyperLevelDBBackendFactory.h" +# include "node/ripple_HyperLevelDBBackendFactory.cpp" +# include "node/ripple_KeyvaDBBackendFactory.h" +# include "node/ripple_KeyvaDBBackendFactory.cpp" +# include "node/ripple_LevelDBBackendFactory.h" +# include "node/ripple_LevelDBBackendFactory.cpp" +# include "node/ripple_MemoryBackendFactory.h" +# include "node/ripple_MemoryBackendFactory.cpp" +# include "node/ripple_NullBackendFactory.h" +# include "node/ripple_NullBackendFactory.cpp" +# include "node/ripple_MdbBackendFactory.h" +# include "node/ripple_MdbBackendFactory.cpp" +# include "node/ripple_SqliteBackendFactory.h" +# include "node/ripple_SqliteBackendFactory.cpp" +# include "main/ripple_RippleMain.h" +#include "main/ripple_RippleMain.cpp" + +} + +//------------------------------------------------------------------------------ + +// Must be outside the namespace for obvious reasons +// +int main (int argc, char** argv) +{ + ripple::RippleMain rippled; + return rippled.runFromMain (argc, argv); } diff --git a/modules/ripple_app/ripple_app.h b/modules/ripple_app/ripple_app.h index bd83c4c1c3..dc77fbe393 100644 --- a/modules/ripple_app/ripple_app.h +++ b/modules/ripple_app/ripple_app.h @@ -7,8 +7,7 @@ #ifndef RIPPLE_APP_H_INCLUDED #define RIPPLE_APP_H_INCLUDED -// Must come before -#include "beast/modules/beast_core/beast_core.h" +#include "beast/modules/beast_core/beast_core.h" // Must come before #if BEAST_LINUX || BEAST_MAC || BEAST_BSD #include @@ -61,7 +60,7 @@ #include "../ripple_core/ripple_core.h" -#include "../ripple_net/ripple_net.h" // for RPCServerHandler ONLY +#include "../ripple_client/ripple_client.h" #include "beast/modules/beast_sqdb/beast_sqdb.h" #include "beast/modules/beast_sqlite/beast_sqlite.h" @@ -97,7 +96,6 @@ namespace ripple #include "ledger/SerializedValidation.h" #include "main/ripple_LoadManager.h" #include "misc/ripple_ProofOfWork.h" -#include "misc/ripple_InfoSub.h" #include "misc/ripple_OrderBook.h" #include "shamap/ripple_SHAMapSyncFilters.h" #include "misc/ripple_IFeatures.h" @@ -161,8 +159,9 @@ namespace ripple #include "contracts/ripple_Interpreter.h" #include "contracts/ripple_Operation.h" -// Move this to the .cpp and remove the include for ripple_net.h -#include "basics/ripple_RPCServerHandler.h" +//#include "misc/ripple_InfoSub.h" +//#include "rpc/CallRPC.h" +//#include "rpc/RPCSub.h" } diff --git a/modules/ripple_app/ripple_app_pt1.cpp b/modules/ripple_app/ripple_app_pt1.cpp index 2787143d00..bb1b750883 100644 --- a/modules/ripple_app/ripple_app_pt1.cpp +++ b/modules/ripple_app/ripple_app_pt1.cpp @@ -8,16 +8,10 @@ #include "ripple_app.h" -#include "beast/modules/beast_db/beast_db.h" -#include "../ripple_mdb/ripple_mdb.h" -#include "../ripple_leveldb/ripple_leveldb.h" -#include "../ripple_hyperleveldb/ripple_hyperleveldb.h" - namespace ripple { #include "peers/ripple_PeerSet.cpp" -#include "misc/ripple_InfoSub.cpp" #include "misc/ripple_OrderBook.cpp" #include "misc/ripple_ProofOfWork.cpp" #include "misc/ripple_ProofOfWorkFactory.h" @@ -26,26 +20,6 @@ namespace ripple #include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application - #include "main/ripple_FatalErrorReporter.h" -#include "main/ripple_FatalErrorReporter.cpp" - #include "main/ripple_RippleMain.h" - #include "node/ripple_HyperLevelDBBackendFactory.h" - #include "node/ripple_KeyvaDBBackendFactory.h" - #include "node/ripple_LevelDBBackendFactory.h" - #include "node/ripple_MdbBackendFactory.h" - #include "node/ripple_MemoryBackendFactory.h" - #include "node/ripple_NullBackendFactory.h" - #include "node/ripple_SqliteBackendFactory.h" -#include "main/ripple_RippleMain.cpp" - -#include "node/ripple_HyperLevelDBBackendFactory.cpp" -#include "node/ripple_KeyvaDBBackendFactory.cpp" -#include "node/ripple_LevelDBBackendFactory.cpp" -#include "node/ripple_MemoryBackendFactory.cpp" -#include "node/ripple_NullBackendFactory.cpp" -#include "node/ripple_MdbBackendFactory.cpp" -#include "node/ripple_SqliteBackendFactory.cpp" - #ifdef _MSC_VER # pragma warning (push) # pragma warning (disable: 4244) // conversion, possible loss of data @@ -58,13 +32,3 @@ namespace ripple #endif } - -//------------------------------------------------------------------------------ - -// Must be outside the namespace for obvious reasons -// -int main (int argc, char** argv) -{ - ripple::RippleMain rippled; - return rippled.runFromMain (argc, argv); -} diff --git a/modules/ripple_app/ripple_app_pt3.cpp b/modules/ripple_app/ripple_app_pt3.cpp index a75f551b07..5fc2720fba 100644 --- a/modules/ripple_app/ripple_app_pt3.cpp +++ b/modules/ripple_app/ripple_app_pt3.cpp @@ -22,7 +22,6 @@ namespace ripple # pragma warning (pop) #endif -#include "basics/ripple_BuildInfo.cpp" #include "node/ripple_NodeObject.cpp" #include "shamap/ripple_SHAMapDelta.cpp" diff --git a/modules/ripple_app/ripple_app_pt4.cpp b/modules/ripple_app/ripple_app_pt4.cpp index f7575e8b33..47b4ba5d11 100644 --- a/modules/ripple_app/ripple_app_pt4.cpp +++ b/modules/ripple_app/ripple_app_pt4.cpp @@ -8,6 +8,8 @@ #include "ripple_app.h" +#include "../ripple_net/ripple_net.h" + namespace ripple { diff --git a/modules/ripple_app/ripple_app_pt5.cpp b/modules/ripple_app/ripple_app_pt5.cpp index 98503e27dd..90e6f7751a 100644 --- a/modules/ripple_app/ripple_app_pt5.cpp +++ b/modules/ripple_app/ripple_app_pt5.cpp @@ -7,6 +7,7 @@ #include "BeastConfig.h" #include "ripple_app.h" +#include "../ripple_net/ripple_net.h" namespace ripple { diff --git a/modules/ripple_app/ripple_app_pt8.cpp b/modules/ripple_app/ripple_app_pt8.cpp index 7387fbf8f0..3559fed881 100644 --- a/modules/ripple_app/ripple_app_pt8.cpp +++ b/modules/ripple_app/ripple_app_pt8.cpp @@ -8,6 +8,14 @@ #include "ripple_app.h" +#include "../ripple_client/ripple_client.h" +#include "../ripple_net/ripple_net.h" + +#ifdef _MSC_VER +#pragma warning (push) +#pragma warning (disable: 4309) // truncation of constant value +#endif + namespace ripple { @@ -15,23 +23,16 @@ namespace ripple #include "rpc/RPCUtil.h" #include "websocket/WSConnection.h" // needs RPCErr -#include "rpc/RPCErr.cpp" -#include "rpc/RPCUtil.cpp" - #ifdef _MSC_VER #pragma warning (push) #pragma warning (disable: 4018) // signed/unsigned mismatch #pragma warning (disable: 4244) // conversion, possible loss of data #endif -#include "rpc/CallRPC.cpp" #include "rpc/RPCHandler.cpp" #ifdef _MSC_VER #pragma warning (pop) #endif -#include "rpc/RPCSub.cpp" - -#include "basics/ripple_RPCServerHandler.cpp" // needs RPCUtil #include "paths/ripple_PathRequest.cpp" // needs RPCErr.h #include "paths/ripple_RippleCalc.cpp" #include "paths/ripple_PathState.cpp" @@ -41,16 +42,12 @@ namespace ripple #include "paths/ripple_RippleLineCache.cpp" #include "ledger/SerializedValidation.cpp" -#ifdef _MSC_VER -#pragma warning (push) -#pragma warning (disable: 4309) // truncation of constant value -#endif #include "websocket/WSConnection.cpp" #include "websocket/WSDoor.cpp" #include "websocket/WSServerHandler.cpp" -#ifdef _MSC_VER -#pragma warning (pop) -#endif } +#ifdef _MSC_VER +#pragma warning (pop) +#endif diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h index be5e477d9d..d605e015ee 100644 --- a/modules/ripple_basics/ripple_basics.h +++ b/modules/ripple_basics/ripple_basics.h @@ -39,8 +39,7 @@ //------------------------------------------------------------------------------ -// Must come before -#include "beast/modules/beast_core/beast_core.h" +#include "beast/modules/beast_core/beast_core.h" // Must come before #include "system/ripple_BoostIncludes.h" diff --git a/modules/ripple_client/ripple_client.cpp b/modules/ripple_client/ripple_client.cpp index 9d1980036e..227966b19b 100644 --- a/modules/ripple_client/ripple_client.cpp +++ b/modules/ripple_client/ripple_client.cpp @@ -7,7 +7,17 @@ #include "BeastConfig.h" #include "../ripple_client/ripple_client.h" +#include "../ripple_core/ripple_core.h" +#include "../ripple_net/ripple_net.h" namespace ripple { + +# include "../ripple_app/rpc/RPCErr.h" +#include "../ripple_app/rpc/RPCErr.cpp" +#include "../ripple_app/rpc/RPCUtil.cpp" +#include "../ripple_app/rpc/CallRPC.cpp" +#include "../ripple_app/rpc/RPCSub.cpp" +#include "../ripple_app/misc/ripple_InfoSub.cpp" + } diff --git a/modules/ripple_client/ripple_client.h b/modules/ripple_client/ripple_client.h index b7a8e917eb..9165bf3800 100644 --- a/modules/ripple_client/ripple_client.h +++ b/modules/ripple_client/ripple_client.h @@ -14,4 +14,21 @@ #ifndef RIPPLE_CLIENT_H #define RIPPLE_CLIENT_H +#include "beast/modules/beast_core/beast_core.h" // Must come before + +#include // InfoSub + +#include "../ripple_core/ripple_core.h" +#include "../ripple_data/ripple_data.h" + +namespace ripple +{ + +#include "../ripple_app/rpc/RPCUtil.h" // only for RPCServerHandler +#include "../ripple_app/rpc/CallRPC.h" + #include "../ripple_app/misc/ripple_InfoSub.h" +#include "../ripple_app/rpc/RPCSub.h" + +} + #endif diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp index 1ed0a1a44b..9b34383a87 100644 --- a/modules/ripple_net/ripple_net.cpp +++ b/modules/ripple_net/ripple_net.cpp @@ -12,8 +12,7 @@ #include "BeastConfig.h" -// Must come before -#include "beast/modules/beast_core/beast_core.h" +#include "beast/modules/beast_core/beast_core.h" // Must come before #include #include