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 subtree Beast 1.0.0-b5

Browse Source 
Merge commit 'a9e507da9b636d394bb43d6bf8002d013530f57a' into develop
This commit is contained in:
Vinnie Falco
2016-05-25 14:47:27 -04:00
parent 846cbf8c78 a9e507da9b
commit fa0ef25ffb
82 changed files with 3885 additions and 2710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -236,26 +236,14 @@
</ClInclude>
<ClInclude Include="..\..\src\BeastConfig.h">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\abstract_ostream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\amount.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_abstract_ostream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_scoped_ostream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_std_ostream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\debug_ostream.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\global_suites.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\print.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\recorder.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\reporter.hpp">
@@ -306,8 +294,6 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\temp_dir.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\write_streambuf.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\error.hpp">
@@ -352,6 +338,8 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\body_type.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\concepts.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser_v1.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\chunk_encode.hpp">
@@ -394,8 +382,6 @@
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\type_check.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\websocket.hpp">
@@ -428,6 +414,8 @@
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\handshake_op.ipp">
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\ping_op.ipp">
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\read_frame_op.ipp">
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\read_op.ipp">

30
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -537,24 +537,9 @@
<ClInclude Include="..\..\src\BeastConfig.h">
<Filter>.</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\abstract_ostream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\amount.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_abstract_ostream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_scoped_ostream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\basic_std_ostream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\debug_ostream.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\detail\const_container.hpp">
<Filter>extras\beast\unit_test\detail</Filter>
</ClInclude>
@@ -564,9 +549,6 @@
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\match.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\print.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\extras\beast\unit_test\recorder.hpp">
<Filter>extras\beast\unit_test</Filter>
</ClInclude>
@@ -642,9 +624,6 @@
<ClInclude Include="..\..\src\beast\include\beast\core\detail\stream_concepts.hpp">
<Filter>include\beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\temp_dir.hpp">
<Filter>include\beast\core\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\core\detail\write_streambuf.hpp">
<Filter>include\beast\core\detail</Filter>
</ClInclude>
@@ -711,6 +690,9 @@
<ClInclude Include="..\..\src\beast\include\beast\http\body_type.hpp">
<Filter>include\beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\concepts.hpp">
<Filter>include\beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\detail\basic_parser_v1.hpp">
<Filter>include\beast\http\detail</Filter>
</ClInclude>
@@ -774,9 +756,6 @@
<ClInclude Include="..\..\src\beast\include\beast\http\string_body.hpp">
<Filter>include\beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\type_check.hpp">
<Filter>include\beast\http</Filter>
</ClInclude>
<ClInclude Include="..\..\src\beast\include\beast\http\write.hpp">
<Filter>include\beast\http</Filter>
</ClInclude>
@@ -825,6 +804,9 @@
<None Include="..\..\src\beast\include\beast\websocket\impl\handshake_op.ipp">
<Filter>include\beast\websocket\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\ping_op.ipp">
<Filter>include\beast\websocket\impl</Filter>
</None>
<None Include="..\..\src\beast\include\beast\websocket\impl\read_frame_op.ipp">
<Filter>include\beast\websocket\impl</Filter>
</None>