Finish moving unsorted sources to appropriate modules

This commit is contained in:
Vinnie Falco
2013-05-22 17:48:01 -07:00
parent 686a588e39
commit c8e601b979
6 changed files with 89 additions and 72 deletions

View File

@@ -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"

View File

@@ -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

View File

@@ -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"

View File

@@ -816,7 +816,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Pathfinder.cpp" />
<ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\PaymentTransactor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -835,7 +840,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\PFRequest.cpp" />
<ClCompile Include="src\cpp\ripple\PFRequest.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\PlatRand.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1071,7 +1079,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp" />
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\utils.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

View File

@@ -52,10 +52,6 @@
<Filter Include="protoc_generated">
<UniqueIdentifier>{7a289f3b-0204-4a4d-b161-589efd3589c0}</UniqueIdentifier>
</Filter>
<Filter Include="Unsorted Sources">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="1. Modules">
<UniqueIdentifier>{a152ed99-bd05-4c37-8ae7-82888b1bb469}</UniqueIdentifier>
</Filter>
@@ -116,6 +112,9 @@
<Filter Include="1. Modules\ripple_net\overlay">
<UniqueIdentifier>{1b44bca2-5d6b-45b6-815b-797059fb2c8e}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_basics\containers">
<UniqueIdentifier>{683c494b-1175-49ac-9714-65640ba50bf5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c">
@@ -400,21 +399,9 @@
<ClCompile Include="src\cpp\protobuf\src\google\protobuf\stubs\substitute.cc">
<Filter>0. Third Party Code\protobuf\stubs</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\PFRequest.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\websocket_core.cpp">
<Filter>0. Third Party Code\websocket</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ripple.pb.cc">
<Filter>protoc_generated</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Transaction.cpp">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClCompile>
@@ -523,24 +510,9 @@
<ClCompile Include="src\cpp\ripple\ProofOfWork.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\RangeSet.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\rfc1751.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMap.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\utils.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
@@ -727,6 +699,33 @@
<ClCompile Include="src\cpp\ripple\NicknameState.cpp">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\RangeSet.cpp">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMap.cpp">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapDiff.cpp">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapNodes.cpp">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\SHAMapSync.cpp">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
<Filter>1. Modules\ripple_main\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\PFRequest.cpp">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\ripple.pb.cc">
<Filter>protoc_generated</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="database\sqlite3ext.h">
@@ -1026,30 +1025,6 @@
<ClInclude Include="src\cpp\protobuf\src\google\protobuf\stubs\type_traits.h">
<Filter>0. Third Party Code\protobuf\stubs</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\KeyCache.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\NetworkStatus.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Pathfinder.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\PFRequest.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Version.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ScopedLock.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SecureAllocator.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ripple.pb.h">
<Filter>protoc_generated</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Transaction.h">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClInclude>
@@ -1155,21 +1130,9 @@
<ClInclude Include="src\cpp\ripple\ProofOfWork.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\RangeSet.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\rfc1751.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SHAMap.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SHAMapSync.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\TaggedCache.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\types.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
@@ -1365,6 +1328,42 @@
<ClInclude Include="src\cpp\ripple\NicknameState.h">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\RangeSet.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\KeyCache.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SHAMap.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SHAMapSync.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\TaggedCache.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ScopedLock.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\SecureAllocator.h">
<Filter>1. Modules\ripple_basics\containers</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Version.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\PFRequest.h">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Pathfinder.h">
<Filter>1. Modules\ripple_ledger\processing</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\NetworkStatus.h">
<Filter>1. Modules\ripple_main\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ripple.pb.h">
<Filter>protoc_generated</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="wallet.xml" />

View File

@@ -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<std::string> getSchema(DatabaseCon* dbc, const std::string& dbName)
{