diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index da5fef184..451ee8770 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -283,52 +283,6 @@ true true - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - true true @@ -775,6 +729,54 @@ true true + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + true @@ -1403,14 +1405,6 @@ - - - - - - - - @@ -1498,6 +1492,14 @@ + + + + + + + + diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index ba5bc28c1..00c33bc95 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -85,9 +85,6 @@ {febf2e7e-f071-4a6c-9b81-68498fc8ea57} - - {bd48a825-192f-4d5e-9230-661fdd65f9b6} - {3ac448dc-9f2e-472b-9f3c-cf9140dddf3a} @@ -148,6 +145,12 @@ {045285aa-9043-4cee-b8ca-cc8881e52f6a} + + {7270818b-573d-45b7-b10b-42f63bedcc50} + + + {1d9bc26d-d76e-4fd4-a737-b968e31e614b} + @@ -495,18 +498,6 @@ [1] Ripple\ripple_net - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - [1] Ripple\ripple_mdb @@ -588,24 +579,9 @@ [0] Subtrees\beast - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - [0] Subtrees\beast - - [1] Ripple\ripple_app\node - [1] Ripple\ripple_app\main @@ -876,6 +852,33 @@ [1] Ripple\ripple_app\tx + + [1] Ripple\ripple_app\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + @@ -1268,18 +1271,6 @@ [1] Ripple\ripple_net - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - [1] Ripple\ripple_mdb @@ -1361,24 +1352,9 @@ [1] Ripple\ripple_core\validator - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - - - [1] Ripple\ripple_app\node - [1] Ripple\ripple_core\functional - - [1] Ripple\ripple_app\node - [1] Ripple\ripple_app\main @@ -1700,6 +1676,33 @@ [1] Ripple\ripple_app\tx + + [1] Ripple\ripple_app\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + + + [1] Ripple\ripple_core\node + diff --git a/modules/ripple_app/main/ripple_RippleMain.cpp b/modules/ripple_app/main/ripple_RippleMain.cpp index cd1012c0b..d6964ed10 100644 --- a/modules/ripple_app/main/ripple_RippleMain.cpp +++ b/modules/ripple_app/main/ripple_RippleMain.cpp @@ -298,37 +298,16 @@ int RippleMain::run (int argc, char const* const* argv) po::positional_options_description p; p.add ("parameters", -1); - //-------------------------------------------------------------------------- + // NOTE: These must be added before the + // Application object is created. // - // NodeStore backend choices + NodeStore::addAvailableBackends (); + + // VFALCO NOTE SqliteBackendFactory is here because it has + // dependencies like SqliteDatabase and DatabaseCon // - // Note: These must be added before the Application object is created - // - - NodeStore::addBackendFactory (LevelDBBackendFactory::getInstance ()); - NodeStore::addBackendFactory (MemoryBackendFactory::getInstance ()); - NodeStore::addBackendFactory (NullBackendFactory::getInstance ()); NodeStore::addBackendFactory (SqliteBackendFactory::getInstance ()); -#if RIPPLE_HYPERLEVELDB_AVAILABLE - NodeStore::addBackendFactory (HyperLevelDBBackendFactory::getInstance ()); -#endif - -#if RIPPLE_MDB_AVAILABLE - NodeStore::addBackendFactory (MdbBackendFactory::getInstance ()); -#endif - - // VFALCO: Disabling KeyvaDB because it is unfinished experimental - // code and there's no sense anyone running it until it meets - // the requirements of a full backend. Now if a programmer wants - // to un-comment it and work on bringing it up to spec on their - // own machine, I certainly won't complain. Let me know, I have - // some new code in a branch. - // - //NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ()); - - //-------------------------------------------------------------------------- - if (! RandomNumbers::getInstance ().initialize ()) { Log::out() << "Unable to add system entropy"; diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp index e84e42026..4516a105a 100644 --- a/modules/ripple_app/ripple_app.cpp +++ b/modules/ripple_app/ripple_app.cpp @@ -6,8 +6,7 @@ #include "BeastConfig.h" -#include "beast/modules/beast_core/beast_core.h" - +#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first #include #include #include @@ -15,13 +14,8 @@ #include "ripple_app.h" -#include "beast/modules/beast_db/beast_db.h" - -#include "../ripple_hyperleveldb/ripple_hyperleveldb.h" #include "../ripple_net/ripple_net.h" #include "../ripple_websocket/ripple_websocket.h" -#include "../ripple_leveldb/ripple_leveldb.h" -#include "../ripple_mdb/ripple_mdb.h" // This .cpp will end up including all of the public header // material in Ripple since it holds the Application object. @@ -65,22 +59,9 @@ namespace ripple // // RippleMain // - -# 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 "node/ripple_SqliteBackendFactory.h" +#include "node/ripple_SqliteBackendFactory.cpp" #include "main/ripple_RippleMain.cpp" } diff --git a/modules/ripple_app/ripple_app.h b/modules/ripple_app/ripple_app.h index b3358cd3c..93806e3b3 100644 --- a/modules/ripple_app/ripple_app.h +++ b/modules/ripple_app/ripple_app.h @@ -34,8 +34,9 @@ //------------------------------------------------------------------------------ +#include "../ripple_basics/ripple_basics.h" #include "../ripple_core/ripple_core.h" - +#include "../ripple_data/ripple_data.h" #include "../ripple_net/ripple_net.h" #include "beast/modules/beast_sqdb/beast_sqdb.h" @@ -52,9 +53,6 @@ namespace ripple #include "data/ripple_SqliteDatabase.h" #include "data/ripple_DBInit.h" -#include "node/ripple_NodeObject.h" -#include "node/ripple_NodeStore.h" - #include "shamap/ripple_SHAMapItem.h" #include "shamap/ripple_SHAMapNode.h" #include "shamap/ripple_SHAMapTreeNode.h" diff --git a/modules/ripple_app/ripple_app_pt3.cpp b/modules/ripple_app/ripple_app_pt3.cpp index 8845618aa..ad3e75653 100644 --- a/modules/ripple_app/ripple_app_pt3.cpp +++ b/modules/ripple_app/ripple_app_pt3.cpp @@ -12,8 +12,6 @@ namespace ripple { #include "ledger/Ledger.cpp" -#include "node/ripple_NodeStore.cpp" -#include "node/ripple_NodeObject.cpp" #include "shamap/ripple_SHAMapDelta.cpp" #include "shamap/ripple_SHAMapNode.cpp" #include "shamap/ripple_SHAMapTreeNode.cpp" diff --git a/modules/ripple_app/node/ripple_HyperLevelDBBackendFactory.cpp b/modules/ripple_core/node/HyperLevelDBBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_HyperLevelDBBackendFactory.cpp rename to modules/ripple_core/node/HyperLevelDBBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_HyperLevelDBBackendFactory.h b/modules/ripple_core/node/HyperLevelDBBackendFactory.h similarity index 86% rename from modules/ripple_app/node/ripple_HyperLevelDBBackendFactory.h rename to modules/ripple_core/node/HyperLevelDBBackendFactory.h index b2f405d3b..d930b9e36 100644 --- a/modules/ripple_app/node/ripple_HyperLevelDBBackendFactory.h +++ b/modules/ripple_core/node/HyperLevelDBBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED -#define RIPPLE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED #if RIPPLE_HYPERLEVELDB_AVAILABLE diff --git a/modules/ripple_app/node/ripple_KeyvaDBBackendFactory.cpp b/modules/ripple_core/node/KeyvaDBBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_KeyvaDBBackendFactory.cpp rename to modules/ripple_core/node/KeyvaDBBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_KeyvaDBBackendFactory.h b/modules/ripple_core/node/KeyvaDBBackendFactory.h similarity index 87% rename from modules/ripple_app/node/ripple_KeyvaDBBackendFactory.h rename to modules/ripple_core/node/KeyvaDBBackendFactory.h index 65d8700b2..4124f64a2 100644 --- a/modules/ripple_app/node/ripple_KeyvaDBBackendFactory.h +++ b/modules/ripple_core/node/KeyvaDBBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_KEYVABACKENDFACTORY_H_INCLUDED -#define RIPPLE_KEYVABACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_KEYVABACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_KEYVABACKENDFACTORY_H_INCLUDED /** Factory to produce KeyvaDB backends for the NodeStore. diff --git a/modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp b/modules/ripple_core/node/LevelDBBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_LevelDBBackendFactory.cpp rename to modules/ripple_core/node/LevelDBBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_LevelDBBackendFactory.h b/modules/ripple_core/node/LevelDBBackendFactory.h similarity index 86% rename from modules/ripple_app/node/ripple_LevelDBBackendFactory.h rename to modules/ripple_core/node/LevelDBBackendFactory.h index 1ec193785..a58f270a2 100644 --- a/modules/ripple_app/node/ripple_LevelDBBackendFactory.h +++ b/modules/ripple_core/node/LevelDBBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_LEVELDBBACKENDFACTORY_H_INCLUDED -#define RIPPLE_LEVELDBBACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_LEVELDBBACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_LEVELDBBACKENDFACTORY_H_INCLUDED /** Factory to produce LevelDB backends for the NodeStore. diff --git a/modules/ripple_app/node/ripple_MdbBackendFactory.cpp b/modules/ripple_core/node/MdbBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_MdbBackendFactory.cpp rename to modules/ripple_core/node/MdbBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_MdbBackendFactory.h b/modules/ripple_core/node/MdbBackendFactory.h similarity index 88% rename from modules/ripple_app/node/ripple_MdbBackendFactory.h rename to modules/ripple_core/node/MdbBackendFactory.h index a05bef970..4b396e6b6 100644 --- a/modules/ripple_app/node/ripple_MdbBackendFactory.h +++ b/modules/ripple_core/node/MdbBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_MDBBACKENDFACTORY_H_INCLUDED -#define RIPPLE_MDBBACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_MDBBACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_MDBBACKENDFACTORY_H_INCLUDED #if RIPPLE_MDB_AVAILABLE diff --git a/modules/ripple_app/node/ripple_MemoryBackendFactory.cpp b/modules/ripple_core/node/MemoryBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_MemoryBackendFactory.cpp rename to modules/ripple_core/node/MemoryBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_MemoryBackendFactory.h b/modules/ripple_core/node/MemoryBackendFactory.h similarity index 86% rename from modules/ripple_app/node/ripple_MemoryBackendFactory.h rename to modules/ripple_core/node/MemoryBackendFactory.h index a548b16cb..d61c93560 100644 --- a/modules/ripple_app/node/ripple_MemoryBackendFactory.h +++ b/modules/ripple_core/node/MemoryBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_MEMORYBACKENDFACTORY_H_INCLUDED -#define RIPPLE_MEMORYBACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_MEMORYBACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_MEMORYBACKENDFACTORY_H_INCLUDED /** Factory to produce a RAM based backend for the NodeStore. diff --git a/modules/ripple_app/node/ripple_NodeObject.cpp b/modules/ripple_core/node/NodeObject.cpp similarity index 100% rename from modules/ripple_app/node/ripple_NodeObject.cpp rename to modules/ripple_core/node/NodeObject.cpp diff --git a/modules/ripple_app/node/ripple_NodeObject.h b/modules/ripple_core/node/NodeObject.h similarity index 97% rename from modules/ripple_app/node/ripple_NodeObject.h rename to modules/ripple_core/node/NodeObject.h index 7bbf7dd58..8d1b089b1 100644 --- a/modules/ripple_app/node/ripple_NodeObject.h +++ b/modules/ripple_core/node/NodeObject.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_NODEOBJECT_H_INCLUDED -#define RIPPLE_NODEOBJECT_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_NODEOBJECT_H_INCLUDED +#define RIPPLE_CORE_NODE_NODEOBJECT_H_INCLUDED /** The types of node objects. */ diff --git a/modules/ripple_app/node/ripple_NodeStore.cpp b/modules/ripple_core/node/NodeStore.cpp similarity index 97% rename from modules/ripple_app/node/ripple_NodeStore.cpp rename to modules/ripple_core/node/NodeStore.cpp index 1d4c89058..54573d99c 100644 --- a/modules/ripple_app/node/ripple_NodeStore.cpp +++ b/modules/ripple_core/node/NodeStore.cpp @@ -537,6 +537,26 @@ NodeStore::Scheduler& NodeStore::getSynchronousScheduler () return scheduler; } +void NodeStore::addAvailableBackends () +{ + // This is part of the ripple_app module since it has dependencies + //NodeStore::addBackendFactory (SqliteBackendFactory::getInstance ()); + + NodeStore::addBackendFactory (LevelDBBackendFactory::getInstance ()); + NodeStore::addBackendFactory (MemoryBackendFactory::getInstance ()); + NodeStore::addBackendFactory (NullBackendFactory::getInstance ()); + +#if RIPPLE_HYPERLEVELDB_AVAILABLE + NodeStore::addBackendFactory (HyperLevelDBBackendFactory::getInstance ()); +#endif + +#if RIPPLE_MDB_AVAILABLE + NodeStore::addBackendFactory (MdbBackendFactory::getInstance ()); +#endif + + NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ()); +} + NodeStore* NodeStore::New (Parameters const& backendParameters, Parameters fastBackendParameters, Scheduler& scheduler) diff --git a/modules/ripple_app/node/ripple_NodeStore.h b/modules/ripple_core/node/NodeStore.h similarity index 98% rename from modules/ripple_app/node/ripple_NodeStore.h rename to modules/ripple_core/node/NodeStore.h index a2c26f72d..ce641f5d2 100644 --- a/modules/ripple_app/node/ripple_NodeStore.h +++ b/modules/ripple_core/node/NodeStore.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_NODESTORE_H_INCLUDED -#define RIPPLE_NODESTORE_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_NODESTORE_H_INCLUDED +#define RIPPLE_CORE_NODE_NODESTORE_H_INCLUDED /** Persistency layer for NodeObject @@ -410,9 +410,7 @@ public: /** Import objects from another database. */ virtual void import (NodeStore& sourceDatabase) = 0; - /** Retrieve the estimated number of pending write operations. - This is used for diagnostics. */ virtual int getWriteLoad () = 0; @@ -427,6 +425,9 @@ public: // VFALCO TODO Document this. virtual void sweep () = 0; + /** Add the known Backend factories to the singleton. + */ + static void addAvailableBackends (); }; #endif diff --git a/modules/ripple_app/node/ripple_NullBackendFactory.cpp b/modules/ripple_core/node/NullBackendFactory.cpp similarity index 100% rename from modules/ripple_app/node/ripple_NullBackendFactory.cpp rename to modules/ripple_core/node/NullBackendFactory.cpp diff --git a/modules/ripple_app/node/ripple_NullBackendFactory.h b/modules/ripple_core/node/NullBackendFactory.h similarity index 87% rename from modules/ripple_app/node/ripple_NullBackendFactory.h rename to modules/ripple_core/node/NullBackendFactory.h index b40633680..7b5bab318 100644 --- a/modules/ripple_app/node/ripple_NullBackendFactory.h +++ b/modules/ripple_core/node/NullBackendFactory.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_NULLBACKENDFACTORY_H_INCLUDED -#define RIPPLE_NULLBACKENDFACTORY_H_INCLUDED +#ifndef RIPPLE_CORE_NODE_NULLBACKENDFACTORY_H_INCLUDED +#define RIPPLE_CORE_NODE_NULLBACKENDFACTORY_H_INCLUDED /** Factory to produce a null backend. diff --git a/modules/ripple_core/ripple_core.cpp b/modules/ripple_core/ripple_core.cpp index 582a5c411..60dd5f4f3 100644 --- a/modules/ripple_core/ripple_core.cpp +++ b/modules/ripple_core/ripple_core.cpp @@ -4,33 +4,48 @@ */ //============================================================================== -/** Add this to get the @ref ripple_core module. - - @file ripple_core.cpp - @ingroup ripple_core -*/ - #include "BeastConfig.h" #include "ripple_core.h" #include +#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first #include #include -//#include + +// For NodeStore backends +#include "beast/modules/beast_db/beast_db.h" +#include "../ripple_hyperleveldb/ripple_hyperleveldb.h" +#include "../ripple_leveldb/ripple_leveldb.h" +#include "../ripple_mdb/ripple_mdb.h" namespace ripple { #include "functional/ripple_Config.cpp" - #include "functional/ripple_LoadFeeTrack.h" // private +# include "functional/ripple_LoadFeeTrack.h" // private #include "functional/ripple_LoadFeeTrack.cpp" #include "functional/ripple_Job.cpp" #include "functional/ripple_JobQueue.cpp" #include "functional/ripple_LoadEvent.cpp" #include "functional/ripple_LoadMonitor.cpp" +# include "node/HyperLevelDBBackendFactory.h" +# include "node/HyperLevelDBBackendFactory.cpp" +# include "node/KeyvaDBBackendFactory.h" +# include "node/KeyvaDBBackendFactory.cpp" +# include "node/LevelDBBackendFactory.h" +# include "node/LevelDBBackendFactory.cpp" +# include "node/MemoryBackendFactory.h" +# include "node/MemoryBackendFactory.cpp" +# include "node/NullBackendFactory.h" +# include "node/NullBackendFactory.cpp" +# include "node/MdbBackendFactory.h" +# include "node/MdbBackendFactory.cpp" +#include "node/NodeStore.cpp" +#include "node/NodeObject.cpp" + #include "validator/ripple_Validator.cpp" #include "validator/ripple_ValidatorImp.h" // private #include "validator/ripple_Validators.cpp" diff --git a/modules/ripple_core/ripple_core.h b/modules/ripple_core/ripple_core.h index 029ca0b50..a96dc375f 100644 --- a/modules/ripple_core/ripple_core.h +++ b/modules/ripple_core/ripple_core.h @@ -4,25 +4,10 @@ */ //============================================================================== -/** Include this to get the @ref ripple_core module. - - @file ripple_core.h - @ingroup ripple_core -*/ - -/** Core classes. - - These objects form the execution framework in which the Ripple - protocol is implemented. - - @defgroup ripple_core -*/ - #ifndef RIPPLE_CORE_RIPPLEHEADER #define RIPPLE_CORE_RIPPLEHEADER #include "../ripple_basics/ripple_basics.h" - #include "../ripple_data/ripple_data.h" namespace ripple @@ -30,15 +15,18 @@ namespace ripple // Order matters -/***/#include "functional/ripple_ConfigSections.h" -/**/#include "functional/ripple_Config.h" -/**/#include "functional/ripple_ILoadFeeTrack.h" -/*..*/#include "functional/ripple_LoadEvent.h" -/*..*/#include "functional/ripple_LoadMonitor.h" -/*.*/#include "functional/ripple_Job.h" -/**/#include "functional/ripple_JobQueue.h" -/*.*/#include "functional/LoadType.h" -/**/#include "functional/LoadSource.h" +# include "functional/ripple_ConfigSections.h" +#include "functional/ripple_Config.h" +#include "functional/ripple_ILoadFeeTrack.h" +# include "functional/ripple_LoadEvent.h" +# include "functional/ripple_LoadMonitor.h" +# include "functional/ripple_Job.h" +#include "functional/ripple_JobQueue.h" +# include "functional/LoadType.h" +#include "functional/LoadSource.h" + +#include "node/NodeObject.h" +#include "node/NodeStore.h" #include "validator/ripple_Validator.h" #include "validator/ripple_ValidatorList.h" diff --git a/modules/ripple_data/ripple_data.cpp b/modules/ripple_data/ripple_data.cpp index cc0ad42e3..b6cb4e02e 100644 --- a/modules/ripple_data/ripple_data.cpp +++ b/modules/ripple_data/ripple_data.cpp @@ -4,26 +4,13 @@ */ //============================================================================== -/** Add this to get the @ref ripple_data module. - - @file ripple_data.cpp - @ingroup ripple_data -*/ - #include "BeastConfig.h" #include "ripple_data.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +//#include +#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first #include #include #include diff --git a/modules/ripple_data/ripple_data.h b/modules/ripple_data/ripple_data.h index 502a4ffe3..54a9c6021 100644 --- a/modules/ripple_data/ripple_data.h +++ b/modules/ripple_data/ripple_data.h @@ -56,6 +56,8 @@ namespace ripple } +//------------------------------------------------------------------------------ + namespace boost { template <>