diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp index 0024b5f97..0dc7ff93a 100644 --- a/modules/ripple_basics/ripple_basics.cpp +++ b/modules/ripple_basics/ripple_basics.cpp @@ -48,6 +48,9 @@ static const uint64 tenTo17m1 = tenTo17 - 1; #pragma warning (disable: 4244) // conversion, possible loss of data #endif +//VFALCO: TODO, figure out how to include this +//#include "src/cpp/ripple.pb.cc" + #include "src/cpp/ripple/Log.cpp" #include "src/cpp/ripple/Amount.cpp" diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp index 852916f34..d726c2aaf 100644 --- a/modules/ripple_ledger/ripple_ledger.cpp +++ b/modules/ripple_ledger/ripple_ledger.cpp @@ -157,6 +157,8 @@ #include "src/cpp/ripple/Offer.cpp" // no log #include "src/cpp/ripple/OrderBook.cpp" // no log #include "src/cpp/ripple/OrderBookDB.cpp" +#include "src/cpp/ripple/Pathfinder.cpp" +#include "src/cpp/ripple/PFRequest.cpp" #include "src/cpp/ripple/RippleCalc.cpp" #include "src/cpp/ripple/RippleState.cpp" // no log diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp index 3d982db03..b0c33abb7 100644 --- a/modules/ripple_main/ripple_main.cpp +++ b/modules/ripple_main/ripple_main.cpp @@ -37,6 +37,7 @@ #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" #include "src/cpp/ripple/ValidationCollection.cpp" diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 9e34f5c31..49d2c0249 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -816,7 +816,12 @@ true true - + + true + true + true + true + true true @@ -835,7 +840,10 @@ true true - + + true + true + true true @@ -1071,7 +1079,12 @@ true true - + + true + true + true + true + true true diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index af05e7501..cdb49f604 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -52,10 +52,6 @@ {7a289f3b-0204-4a4d-b161-589efd3589c0} - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - {a152ed99-bd05-4c37-8ae7-82888b1bb469} @@ -116,6 +112,9 @@ {1b44bca2-5d6b-45b6-815b-797059fb2c8e} + + {683c494b-1175-49ac-9714-65640ba50bf5} + @@ -400,21 +399,9 @@ 0. Third Party Code\protobuf\stubs - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - 0. Third Party Code\websocket - - protoc_generated - 1. Modules\ripple_ledger\transactions @@ -523,24 +510,9 @@ 1. Modules\ripple_basics\types - - 1. Modules\ripple_basics\types - 1. Modules\ripple_basics\types - - 1. Modules\ripple_basics\types - - - 1. Modules\ripple_basics\types - - - 1. Modules\ripple_basics\types - - - 1. Modules\ripple_basics\types - 1. Modules\ripple_basics\types @@ -727,6 +699,33 @@ 1. Modules\ripple_ledger\processing + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_main\core + + + 1. Modules\ripple_ledger\processing + + + 1. Modules\ripple_ledger\processing + + + protoc_generated + @@ -1026,30 +1025,6 @@ 0. Third Party Code\protobuf\stubs - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - - - Unsorted Sources - - - protoc_generated - 1. Modules\ripple_ledger\transactions @@ -1155,21 +1130,9 @@ 1. Modules\ripple_basics\types - - 1. Modules\ripple_basics\types - 1. Modules\ripple_basics\types - - 1. Modules\ripple_basics\types - - - 1. Modules\ripple_basics\types - - - 1. Modules\ripple_basics\types - 1. Modules\ripple_basics\types @@ -1365,6 +1328,42 @@ 1. Modules\ripple_ledger\processing + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_basics\types + + + 1. Modules\ripple_basics\containers + + + 1. Modules\ripple_main\core + + + 1. Modules\ripple_ledger\processing + + + 1. Modules\ripple_ledger\processing + + + 1. Modules\ripple_main\core + + + protoc_generated + diff --git a/src/cpp/ripple/UpdateTables.cpp b/src/cpp/ripple/UpdateTables.cpp index 5be595b2f..9a31b360c 100644 --- a/src/cpp/ripple/UpdateTables.cpp +++ b/src/cpp/ripple/UpdateTables.cpp @@ -1,6 +1,5 @@ -#include "Application.h" -#include "Log.h" +//VFALCO: TODO, clean this up since it is just a file holding a single member function definition static std::vector getSchema(DatabaseCon* dbc, const std::string& dbName) {