Refactor LoadFeeTrack into ILoadFeeTrack, split DatabaseCon out from Application.h

Conflicts:
	src/cpp/ripple/Application.cpp

modules/ripple_basics/ripple_basics.h

@@ -113,6 +113,10 @@ namespace boost {
 // UInt256
 #include <boost/functional/hash.hpp>
 
+// ripple_PlatformMacros.h
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+
 // VFALCO: TODO, remove this dependency!!!
 #include <openssl/dh.h> // for DiffieHellmanUtil
 #include <openssl/ripemd.h> // For HashUtilities

modules/ripple_basics/utility/ripple_PlatformMacros.h

@@ -23,6 +23,8 @@
 
 #if (!defined(FORCE_NO_C11X) && (__cplusplus > 201100L)) || defined(FORCE_C11X)
 
+// VFALCO: TODO, replace BIND_TYPE with a namespace lift
+
 #define C11X
 #include			 	<functional>
 #define UPTR_T			std::unique_ptr
@@ -36,8 +38,6 @@
 
 #else
 
-#include 				<boost/bind.hpp>
-#include				<boost/function.hpp>
 #define UPTR_T			std::auto_ptr
 #define MOVE_P(p)		(p)
 #define BIND_TYPE		boost::bind

modules/ripple_ledger/ripple_ledger.cpp

@@ -124,12 +124,15 @@
 // New abstract interfaces
 #include "src/cpp/ripple/ripple_IFeatures.h"
 #include "src/cpp/ripple/ripple_IFeeVote.h"
+#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
 #include "src/cpp/ripple/FeatureTable.h"
 
 //------------------------------------------------------------------------------
 
 // main
+#include "src/cpp/ripple/ripple_DatabaseCon.cpp"
 #include "src/cpp/ripple/Application.cpp"
+#include "src/cpp/ripple/LoadManager.cpp"
 
 // contracts
 #include "src/cpp/ripple/Contract.cpp" // no log
@@ -192,6 +195,7 @@
 // Implementation of interfaces
 
 #include "src/cpp/ripple/ripple_FeeVote.cpp"
+#include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
 
 #ifdef _MSC_VER
 //#pragma warning (pop)

modules/ripple_main/ripple_main.cpp

@@ -34,9 +34,10 @@
 #pragma warning (disable: 4535) // call requires /EHa
 #endif
 
+#include "src/cpp/ripple/Application.h" // VFALCO: TODO Remove this dependency
+
 #include "src/cpp/ripple/Config.cpp" // no log
 #include "src/cpp/ripple/JobQueue.cpp"
-#include "src/cpp/ripple/LoadManager.cpp"
 #include "src/cpp/ripple/LoadMonitor.cpp"
 #include "src/cpp/ripple/UpdateTables.cpp"
 #include "src/cpp/ripple/main.cpp"

modules/ripple_net/ripple_net.cpp

@@ -28,6 +28,8 @@
 
 #include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
 
+#include "src/cpp/ripple/ripple_ILoadFeeTrack.h" // for NetworkOPs
+
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"