ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 02:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ripple_json to ripple_basics

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-01 09:34:42 -07:00
parent 825ac4aca1
commit e256716da8
25 changed files with 162 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -696,6 +696,24 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_reader.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="..\..\modules\ripple_basics\json\json_value.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="..\..\modules\ripple_basics\json\json_writer.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="..\..\modules\ripple_basics\ripple_basics.cpp" />
<ClCompile Include="..\..\modules\ripple_basics\types\ripple_UInt256.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -959,25 +977,6 @@
</ClCompile>
<ClCompile Include="..\..\modules\ripple_data\ripple_data.cpp" />
<ClCompile Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.cpp" />
<ClCompile Include="..\..\modules\ripple_json\json\json_reader.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="..\..\modules\ripple_json\json\json_value.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="..\..\modules\ripple_json\json\json_writer.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="..\..\modules\ripple_json\ripple_json.cpp" />
<ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp" />
<ClCompile Include="..\..\modules\ripple_mdb\ripple_mdb.c" />
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.cpp">
@@ -1482,6 +1481,14 @@
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_SecureAllocator.h" />
<ClInclude Include="..\..\modules\ripple_basics\containers\ripple_TaggedCache.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_autolink.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_batchallocator.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_config.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_features.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_forwards.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_reader.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_value.h" />
<ClInclude Include="..\..\modules\ripple_basics\json\json_writer.h" />
<ClInclude Include="..\..\modules\ripple_basics\ripple_basics.h" />
<ClInclude Include="..\..\modules\ripple_basics\system\ripple_BoostIncludes.h" />
<ClInclude Include="..\..\modules\ripple_basics\system\ripple_OpenSSLIncludes.h" />
@@ -1547,15 +1554,6 @@
<ClInclude Include="..\..\modules\ripple_data\ripple_data.h" />
<ClInclude Include="..\..\modules\ripple_data\utility\ripple_UptimeTimerAdapter.h" />
<ClInclude Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_autolink.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_batchallocator.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_config.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_features.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_forwards.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_reader.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_value.h" />
<ClInclude Include="..\..\modules\ripple_json\json\json_writer.h" />
<ClInclude Include="..\..\modules\ripple_json\ripple_json.h" />
<ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" />
<ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.h" />
@@ -1650,9 +1648,11 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs>
</CustomBuild>
<None Include="..\..\modules\ripple_json\json\json_internalarray.inl" />
<None Include="..\..\modules\ripple_json\json\json_internalmap.inl" />
<None Include="..\..\modules\ripple_json\json\json_valueiterator.inl" />
<None Include="..\..\modules\ripple_basics\json\json_internalarray.inl" />
<None Include="..\..\modules\ripple_basics\json\json_internalmap.inl" />
<None Include="..\..\modules\ripple_basics\json\json_valueiterator.inl" />
<None Include="..\..\modules\ripple_basics\json\LICENSE" />
<None Include="..\..\modules\ripple_basics\json\version" />
<None Include="..\..\rippled-example.cfg" />
<None Include="..\..\SConstruct" />
<None Include="..\QtCreator\rippled.pro" />

123
Builds/VisualStudio2012/RippleD.vcxproj.filters
View File

@@ -25,9 +25,6 @@
<Filter Include="[1] Ripple\ripple_core">
<UniqueIdentifier>{e0dd916d-72b2-46cd-840a-fb5e924a470a}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_json">
<UniqueIdentifier>{0d065d55-0a7b-480b-beee-67dad6ee6684}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_data">
<UniqueIdentifier>{df861e00-baa6-43d4-bbbf-df61d66ee414}</UniqueIdentifier>
</Filter>
@@ -67,9 +64,6 @@
<Filter Include="[1] Ripple\ripple_data\utility">
<UniqueIdentifier>{a837f3ce-75b7-4e6c-b8b1-728b6a1216bd}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_json\json">
<UniqueIdentifier>{9d43b540-fdec-484d-a8bd-0dc65d3b0c55}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_websocket\autosocket">
<UniqueIdentifier>{99ac4d07-04a7-4ce3-96c7-b8ea578f1a61}</UniqueIdentifier>
</Filter>
@@ -160,6 +154,9 @@
<Filter Include="[1] Ripple\ripple_app\websocket">
<UniqueIdentifier>{7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_basics\json">
<UniqueIdentifier>{083291b1-1498-490e-9794-4319d21d5668}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
@@ -306,18 +303,6 @@
<ClCompile Include="..\..\modules\ripple_data\ripple_data.cpp">
<Filter>[1] Ripple\ripple_data</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\json\json_reader.cpp">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\json\json_value.cpp">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\json\json_writer.cpp">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_json\ripple_json.cpp">
<Filter>[1] Ripple\ripple_json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp">
<Filter>[1] Ripple\ripple_leveldb</Filter>
</ClCompile>
@@ -882,6 +867,21 @@
<ClCompile Include="..\..\modules\ripple_data\protocol\BuildInfo.cpp">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
<Filter>[1] Ripple\ripple_app\rpc</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\ripple_app.cpp">
<Filter>[1] Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_reader.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_value.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_writer.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1046,33 +1046,6 @@
<ClInclude Include="..\..\modules\ripple_data\ripple_data.h">
<Filter>[1] Ripple\ripple_data</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_autolink.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_batchallocator.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_config.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_features.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_forwards.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_reader.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_value.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\json\json_writer.h">
<Filter>[1] Ripple\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_json\ripple_json.h">
<Filter>[1] Ripple\ripple_json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h">
<Filter>[1] Ripple\ripple_leveldb</Filter>
</ClInclude>
@@ -1679,6 +1652,42 @@
<ClInclude Include="..\..\modules\ripple_data\protocol\BuildInfo.h">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
<Filter>[1] Ripple\ripple_app\rpc</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_core\functional\LoadSource.h">
<Filter>[1] Ripple\ripple_core\functional</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_core\functional\LoadType.h">
<Filter>[1] Ripple\ripple_core\functional</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\main\ripple_LoadManager.h">
<Filter>[1] Ripple\ripple_app\main</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_autolink.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_batchallocator.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_config.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_features.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_forwards.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_reader.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_value.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\json\json_writer.h">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">
@@ -1686,15 +1695,6 @@
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="..\..\modules\ripple_json\json\json_internalarray.inl">
<Filter>[1] Ripple\ripple_json\json</Filter>
</None>
<None Include="..\..\modules\ripple_json\json\json_internalmap.inl">
<Filter>[1] Ripple\ripple_json\json</Filter>
</None>
<None Include="..\..\modules\ripple_json\json\json_valueiterator.inl">
<Filter>[1] Ripple\ripple_json\json</Filter>
</None>
<None Include="..\..\CheatSheet.md">
<Filter>%28Notes%29</Filter>
</None>
@@ -1713,6 +1713,21 @@
<None Include="..\..\SConstruct">
<Filter>[2] Build</Filter>
</None>
<None Include="..\..\modules\ripple_basics\json\json_internalarray.inl">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</None>
<None Include="..\..\modules\ripple_basics\json\json_internalmap.inl">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</None>
<None Include="..\..\modules\ripple_basics\json\json_valueiterator.inl">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</None>
<None Include="..\..\modules\ripple_basics\json\LICENSE">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</None>
<None Include="..\..\modules\ripple_basics\json\version">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\Notes\VFALCO_TODO.txt">