Rename to ripple_asio

BeastConfig.h

@@ -146,7 +146,6 @@
 //#define RIPPLE_VERIFY_NODEOBJECT_KEYS 1
 #endif
 
-
+#define RIPPLE_USES_BEAST_SOCKETS 0
-#define RIPPLE_USES_BEAST_SOCKETS 1
 
 #endif

Builds/QtCreator/rippled.pro

@@ -74,8 +74,8 @@ SOURCES += \
     ../../modules/ripple_app/ripple_app_pt6.cpp \
     ../../modules/ripple_app/ripple_app_pt7.cpp \
     ../../modules/ripple_app/ripple_app_pt8.cpp \
+    ../../modules/ripple_asio/ripple_asio.cpp \
     ../../modules/ripple_basics/ripple_basics.cpp \
-    ../../modules/ripple_basio/ripple_basio.cpp \
     ../../modules/ripple_core/ripple_core.cpp \
     ../../modules/ripple_client/ripple_client.cpp \
     ../../modules/ripple_data/ripple_data.cpp \

Builds/VisualStudio2012/RippleD.vcxproj

@@ -677,6 +677,25 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\boost\ripple_IoService.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\boost\ripple_SslContext.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\ripple_asio.cpp" />
+    <ClCompile Include="..\..\modules\ripple_asio\tests\ripple_AsioTests.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -768,30 +787,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\boost\ripple_IoService.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_basio\boost\ripple_SslContext.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_basio\ripple_basio.cpp">
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level4</WarningLevel>
-      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level4</WarningLevel>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\tests\ripple_AsioTests.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_client\ripple_client.cpp" />
     <ClCompile Include="..\..\modules\ripple_core\functional\ripple_Config.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1491,6 +1486,11 @@
     <ClInclude Include="..\..\modules\ripple_app\tx\Transactor.h" />
     <ClInclude Include="..\..\modules\ripple_app\tx\TrustSetTransactor.h" />
     <ClInclude Include="..\..\modules\ripple_app\tx\WalletAddTransactor.h" />
+    <ClInclude Include="..\..\modules\ripple_asio\boost\ripple_IoService.h" />
+    <ClInclude Include="..\..\modules\ripple_asio\boost\ripple_SslContext.h" />
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio.h" />
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio_fwdecl.h" />
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio_impl.h" />
     <ClInclude Include="..\..\modules\ripple_basics\containers\ripple_KeyCache.h" />
     <ClInclude Include="..\..\modules\ripple_basics\containers\ripple_RangeSet.h" />
     <ClInclude Include="..\..\modules\ripple_basics\containers\ripple_SecureAllocator.h" />
@@ -1517,11 +1517,6 @@
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_ThreadName.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Time.h" />
     <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_UptimeTimer.h" />
-    <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_IoService.h" />
-    <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_SslContext.h" />
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio.h" />
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio_fwdecl.h" />
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio_impl.h" />
     <ClInclude Include="..\..\modules\ripple_client\ripple_client.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_Config.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_ConfigSections.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -94,12 +94,6 @@
     <Filter Include="[0] Subtrees\leveldb\port\win">
       <UniqueIdentifier>{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_basio">
-      <UniqueIdentifier>{c6a852db-1174-4bf6-a726-ebaabf595743}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="[1] Ripple\ripple_basio\boost">
-      <UniqueIdentifier>{c977169f-d68b-4a59-aa0b-f7d49157d9ac}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[1] Ripple\ripple_net">
       <UniqueIdentifier>{c84fc3af-f487-4eba-af78-d4be009f76d1}</UniqueIdentifier>
     </Filter>
@@ -160,8 +154,14 @@
     <Filter Include="[2] Build">
       <UniqueIdentifier>{c69b07a2-44e5-4b06-99a9-81f5d137ea15}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_basio\tests">
+    <Filter Include="[1] Ripple\ripple_asio">
-      <UniqueIdentifier>{271e2469-a2e6-40c6-acc9-aa75cd6e59c3}</UniqueIdentifier>
+      <UniqueIdentifier>{a8c5d8be-1e90-4e9c-be7f-d2da53920cd4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_asio\boost">
+      <UniqueIdentifier>{f4e4fbf0-3dd2-4413-8318-9d6bc15ada57}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_asio\tests">
+      <UniqueIdentifier>{2fdf2a12-4f97-45f6-a63d-7e99e97835dd}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -531,12 +531,6 @@
     <ClCompile Include="..\..\modules\ripple_data\protocol\ripple_LedgerFormats.cpp">
       <Filter>[1] Ripple\ripple_data\protocol</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\ripple_basio.cpp">
-      <Filter>[1] Ripple\ripple_basio</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\boost\ripple_IoService.cpp">
-      <Filter>[1] Ripple\ripple_basio\boost</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
       <Filter>[1] Ripple\ripple_net</Filter>
     </ClCompile>
@@ -555,9 +549,6 @@
     <ClCompile Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.cpp">
       <Filter>[1] Ripple\ripple_net\basics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\boost\ripple_SslContext.cpp">
-      <Filter>[1] Ripple\ripple_basio\boost</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClCompile>
@@ -888,12 +879,21 @@
     <ClCompile Include="..\..\modules\ripple_app\main\ripple_RippleMain.cpp">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_basio\tests\ripple_AsioTests.cpp">
-      <Filter>[1] Ripple\ripple_basio\tests</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_asio\beast_asio.cpp">
       <Filter>[0] Subtrees\beast</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\ripple_asio.cpp">
+      <Filter>[1] Ripple\ripple_asio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\tests\ripple_AsioTests.cpp">
+      <Filter>[1] Ripple\ripple_asio\tests</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\boost\ripple_SslContext.cpp">
+      <Filter>[1] Ripple\ripple_asio\boost</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_asio\boost\ripple_IoService.cpp">
+      <Filter>[1] Ripple\ripple_asio\boost</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1319,18 +1319,6 @@
     <ClInclude Include="..\..\modules\ripple_data\protocol\ripple_LedgerFormats.h">
       <Filter>[1] Ripple\ripple_data\protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio.h">
-      <Filter>[1] Ripple\ripple_basio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio_impl.h">
-      <Filter>[1] Ripple\ripple_basio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_basio\ripple_basio_fwdecl.h">
-      <Filter>[1] Ripple\ripple_basio</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_IoService.h">
-      <Filter>[1] Ripple\ripple_basio\boost</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
       <Filter>[1] Ripple\ripple_net</Filter>
     </ClInclude>
@@ -1349,9 +1337,6 @@
     <ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h">
       <Filter>[1] Ripple\ripple_net\basics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_basio\boost\ripple_SslContext.h">
-      <Filter>[1] Ripple\ripple_basio\boost</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClInclude>
@@ -1688,6 +1673,21 @@
     <ClInclude Include="..\..\modules\ripple_app\main\ripple_RippleMain.h">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio.h">
+      <Filter>[1] Ripple\ripple_asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio_fwdecl.h">
+      <Filter>[1] Ripple\ripple_asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_asio\ripple_asio_impl.h">
+      <Filter>[1] Ripple\ripple_asio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_asio\boost\ripple_SslContext.h">
+      <Filter>[1] Ripple\ripple_asio\boost</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_asio\boost\ripple_IoService.h">
+      <Filter>[1] Ripple\ripple_asio\boost</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

SConstruct

@@ -133,8 +133,8 @@ COMPILED_FILES = [
     'modules/ripple_app/ripple_app_pt6.cpp',
     'modules/ripple_app/ripple_app_pt7.cpp',
     'modules/ripple_app/ripple_app_pt8.cpp',
+    'modules/ripple_asio/ripple_asio.cpp',
     'modules/ripple_basics/ripple_basics.cpp',
-    'modules/ripple_basio/ripple_basio.cpp',
     'modules/ripple_core/ripple_core.cpp',
     'modules/ripple_data/ripple_data.cpp',
     'modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp',

modules/ripple_app/ripple_app.h

@@ -22,6 +22,6 @@
 
 #include "modules/ripple_basics/ripple_basics.h"
 
-#include "modules/ripple_basio/ripple_basio.h"
+#include "modules/ripple_asio/ripple_asio.h"
 
 #endif

modules/ripple_asio/ripple_asio.cpp

@@ -4,10 +4,10 @@
 */
 //==============================================================================
 
-/** Add this to get the @ref ripple_basio module.
+/** Add this to get the @ref ripple_asio module.
 
-    @file ripple_basio.cpp
+    @file ripple_asio.cpp
-    @ingroup ripple_basio
+    @ingroup ripple_asio
 */
 
 //------------------------------------------------------------------------------
@@ -17,9 +17,9 @@
 #include "beast/modules/beast_basics/beast_basics.h"
 #include "beast/modules/beast_asio/beast_asio.h"
 
-#include "ripple_basio.h"
+#include "ripple_asio.h"
 
-#include "ripple_basio_impl.h"
+#include "ripple_asio_impl.h"
 
 namespace ripple
 {

modules/ripple_asio/ripple_asio.h

@@ -4,14 +4,14 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_BASIO_H_INCLUDED
+#ifndef RIPPLE_ASIO_H_INCLUDED
-#define RIPPLE_BASIO_H_INCLUDED
+#define RIPPLE_ASIO_H_INCLUDED
 
 #include "beast/modules/beast_core/beast_core.h"
 
 // Must be outside the namespace
 
-#include "ripple_basio_fwdecl.h"
+#include "ripple_asio_fwdecl.h"
 
 /** Abstractions for boost::asio
 
@@ -19,8 +19,8 @@
     These classes are designed to move boost::asio header material out of
     the majority of include paths.
 
-    @ingroup ripple_basio
+    @ingroup ripple_asio
-    @file ripple_basio.h
+    @file ripple_asio.h
 */
 namespace ripple
 {

modules/ripple_asio/ripple_asio_fwdecl.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_BASIO_FWDECL_H_INCLUDED
+#ifndef RIPPLE_ASIO_FWDECL_H_INCLUDED
-#define RIPPLE_BASIO_FWDECL_H_INCLUDED
+#define RIPPLE_ASIO_FWDECL_H_INCLUDED
 
 /** Forward declarations for boost::asio.
 

modules/ripple_asio/ripple_asio_impl.h

@@ -4,10 +4,10 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_BASIO_IMPL_H_INCLUDED
+#ifndef RIPPLE_ASIO_IMPL_H_INCLUDED
-#define RIPPLE_BASIO_IMPL_H_INCLUDED
+#define RIPPLE_ASIO_IMPL_H_INCLUDED
 
-// Once everything is converted, these can be moved to ripple_basio.cpp
+// Once everything is converted, these can be moved to ripple_asio.cpp
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ssl.hpp>