Tidy up move obsolete and deprecated files

Builds/VisualStudio2012/RippleD.vcxproj

@@ -31,6 +31,18 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\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_app\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_app\consensus\ripple_DisputedTx.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -671,18 +683,6 @@
       <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\sockets\ripple_RippleTlsContext.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1379,6 +1379,8 @@
     <ClInclude Include="..\..\BeastConfig.h" />
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_BuildInfo.h" />
     <ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h" />
+    <ClInclude Include="..\..\modules\ripple_app\boost\ripple_IoService.h" />
+    <ClInclude Include="..\..\modules\ripple_app\boost\ripple_SslContext.h" />
     <ClInclude Include="..\..\modules\ripple_app\consensus\ripple_DisputedTx.h" />
     <ClInclude Include="..\..\modules\ripple_app\consensus\ripple_LedgerConsensus.h" />
     <ClInclude Include="..\..\modules\ripple_app\contracts\ripple_Contract.h" />
@@ -1479,11 +1481,7 @@
     <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_asio\sockets\ripple_MultiSocket.cpp" />
     <ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.h" />
     <ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocketType.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -157,12 +157,12 @@
     <Filter Include="[1] Ripple\ripple_asio">
       <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\sockets">
       <UniqueIdentifier>{625992a9-7333-4782-8ee3-6ed072d02fe5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\ripple_app\boost">
+      <UniqueIdentifier>{8476f6e8-7411-460f-bdef-68e3166078eb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Subtrees\sqlite\sqlite3.c">
@@ -882,15 +882,15 @@
     <ClCompile Include="..\..\modules\ripple_asio\ripple_asio.cpp">
       <Filter>[1] Ripple\ripple_asio</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>
     <ClCompile Include="..\..\modules\ripple_asio\sockets\ripple_RippleTlsContext.cpp">
       <Filter>[1] Ripple\ripple_asio\sockets</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\boost\ripple_IoService.cpp">
+      <Filter>[1] Ripple\ripple_app\boost</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\boost\ripple_SslContext.cpp">
+      <Filter>[1] Ripple\ripple_app\boost</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1670,18 +1670,6 @@
     <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>
     <ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocket.h">
       <Filter>[1] Ripple\ripple_asio\sockets</Filter>
     </ClInclude>
@@ -1694,6 +1682,12 @@
     <ClInclude Include="..\..\modules\ripple_asio\sockets\ripple_MultiSocketType.h">
       <Filter>[1] Ripple\ripple_asio\sockets</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\boost\ripple_IoService.h">
+      <Filter>[1] Ripple\ripple_app\boost</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\boost\ripple_SslContext.h">
+      <Filter>[1] Ripple\ripple_app\boost</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj

@@ -83,7 +83,6 @@
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketBase.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketInterface.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapper.h" />
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapperBasics.h" />
     <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SslContext.h" />
     <ClInclude Include="..\..\modules\beast_asio\system\beast_BoostIncludes.h" />
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeer.h" />

Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters

@@ -785,9 +785,6 @@
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerBasics.h">
       <Filter>beast_asio\tests</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_asio\sockets\beast_SocketWrapperBasics.h">
-      <Filter>beast_asio\sockets</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\tests\beast_TestPeerLogic.h">
       <Filter>beast_asio\tests</Filter>
     </ClInclude>

Subtrees/beast/modules/beast_asio/beast_asio.h

@@ -57,7 +57,6 @@ namespace beast
 #include "sockets/beast_SocketBase.h"
 #include "sockets/beast_Socket.h"
 #include "sockets/beast_SocketInterface.h"
-#include "sockets/beast_SocketWrapperBasics.h"
 #include "sockets/beast_SocketWrapper.h"
 #include "sockets/beast_SharedSocket.h"
 #include "sockets/beast_SslContext.h"

Subtrees/beast/modules/beast_asio/sockets/beast_SocketWrapper.h

@@ -119,8 +119,7 @@ namespace SocketWrapperMemberChecks
 
 template <typename WrappedObject>
 class SocketWrapper
-    : public virtual Socket
+    : public Socket
-    , public SocketWrapperBasics
     , public Uncopyable
 {
 private:

Subtrees/beast/modules/beast_asio/sockets/beast_SocketWrapperBasics.h

@@ -1,136 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    This file is part of Beast: https://github.com/vinniefalco/Beast
-    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose  with  or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
-
-    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
-    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef BEAST_SOCKETWRAPPERBASICS_H_INCLUDED
-#define BEAST_SOCKETWRAPPERBASICS_H_INCLUDED
-
-/** Some utilities for SocketWrapper and others.
-*/
-class SocketWrapperBasics
-{
-public:
-#if 0
-    /** Template specialization to determine available interfaces. */
-    template <typename Object>
-    struct InterfacesOf
-    {
-        /** Intrusive tag support.
-
-            To use this, add a struct called SocketInterfaces to your
-            class and derive it from the interfaces that you support.
-            For example:
-
-            @code
-
-            struct MyHandshakingStream
-            {
-                struct SocketInterfaces
-                    : SocketInterface::Stream
-                    , SocketInterface::Handshake
-                {
-                };
-            }
-
-            @endcode
-        */
-        typedef typename Object::SocketInterfaces type;
-        typedef type value;
-    };
-
-    // Specialization for boost::asio::basic_socket_acceptor
-    template <typename Protocol, typename SocketService>
-    struct InterfacesOf <boost::asio::basic_socket_acceptor <Protocol, SocketService> >
-    {
-        struct value : SocketInterface::Acceptor { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::basic_socket
-    template <typename Protocol, typename SocketService>
-    struct InterfacesOf <boost::asio::basic_socket <Protocol, SocketService> >
-    {
-        struct value : SocketInterface::Socket { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::basic_stream_socket
-    template <typename Protocol, typename SocketService>
-    struct InterfacesOf <boost::asio::basic_stream_socket <Protocol, SocketService> >
-    {
-        struct value : SocketInterface::Socket, SocketInterface::Stream { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::buffered_stream
-    template <typename Stream>
-    struct InterfacesOf <boost::asio::buffered_stream <Stream> >
-    {
-        struct value : SocketInterface::Stream { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::buffered_read_stream
-    template <typename Stream>
-    struct InterfacesOf <boost::asio::buffered_read_stream <Stream> >
-    {
-        struct value : SocketInterface::Stream { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::buffered_write_stream
-    template <typename Stream>
-    struct InterfacesOf <boost::asio::buffered_write_stream <Stream> >
-    {
-        struct value : SocketInterface::Stream { };
-        typedef value type;
-    };
-
-    // Specialization for boost::asio::ssl::stream
-    template <typename Stream>
-    struct InterfacesOf <boost::asio::ssl::stream <Stream> >
-    {
-        struct value : SocketInterface::Stream , SocketInterface::Handshake { };
-        typedef value type;
-    };
-
-#if 1
-    // Less elegant, but works.
-    // Determines if Object supports the specified Interface
-    template <typename Object, typename Interface, class Enable = void>
-    struct HasInterface : boost::false_type { };
-
-    template <typename Object, typename Interface>
-    struct HasInterface <Object, Interface,
-        typename boost::enable_if <boost::is_base_of <
-        Interface, typename InterfacesOf <Object>::type> >::type >
-        : boost::true_type { };
-#else
-    // This should work, but doesn't.
-    // K-ballo from #boost suggested it.
-    //
-    // Determines if Object supports the specified Interface
-    template <typename Object, typename Interface>
-    struct HasInterface : boost::is_base_of <Interface, typename InterfacesOf <Object> >
-    {
-    };
-#endif
-#endif
-};
-
-#endif

modules/ripple_app/ripple_app.cpp

@@ -157,6 +157,8 @@ namespace ripple
 #include "tx/TransactionMaster.h"
 #include "main/ripple_LocalCredentials.h"
 #include "network/WSDoor.h"
+ #include "boost/ripple_IoService.h"
+ #include "boost/ripple_SslContext.h"
 #include "main/ripple_Application.h"
 #include "rpc/RPCHandler.h"
 #include "tx/TransactionQueue.h"
@@ -295,6 +297,9 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "data/ripple_SqliteDatabase.cpp"
 #include "data/ripple_DBInit.cpp"
 
+#include "boost/ripple_IoService.cpp"
+#include "boost/ripple_SslContext.cpp"
+
 #endif
 
 //------------------------------------------------------------------------------

modules/ripple_app/ripple_app.h

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

modules/ripple_asio/ripple_asio.cpp

@@ -14,18 +14,29 @@
 
 #include "BeastConfig.h"
 
+// Must come before <boost/bind.hpp>
+#include "beast/modules/beast_core/beast_core.h"
+
+#include <boost/version.hpp>
+#include <boost/asio/io_service.hpp>
+#include <boost/asio/ssl.hpp>
+#include <boost/asio.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/bind.hpp>
+#include <boost/array.hpp>
+#include <boost/foreach.hpp>
+#include <boost/unordered_map.hpp> // for unit test
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/vector.hpp>
+
 #include "beast/modules/beast_basics/beast_basics.h"
+#include "beast/modules/beast_asio/beast_asio.h"
 
 #include "ripple_asio.h"
 
-#include "ripple_asio_impl.h"
-
 namespace ripple
 {
 
-#include "boost/ripple_IoService.cpp"
-#include "boost/ripple_SslContext.cpp"
-
 #  include "sockets/ripple_RippleTlsContext.h"
 # include "sockets/ripple_MultiSocket.h"
 #include "sockets/ripple_MultiSocketType.h"

modules/ripple_asio/ripple_asio.h

@@ -7,29 +7,13 @@
 #ifndef RIPPLE_ASIO_H_INCLUDED
 #define RIPPLE_ASIO_H_INCLUDED
 
-#include "beast/modules/beast_core/beast_core.h"
-#include "beast/modules/beast_asio/beast_asio.h"
-
-// Must be outside the namespace
-
-#include "ripple_asio_fwdecl.h"
-
-/** Abstractions for boost::asio
-
-    This is the first step to removing the dependency on boost::asio.
-    These classes are designed to move boost::asio header material out of
-    the majority of include paths.
-
-    @ingroup ripple_asio
-    @file ripple_asio.h
-*/
 namespace ripple
 {
 
 using namespace beast;
 
-#include "boost/ripple_IoService.h"
+//#include "sockets/ripple_TlsContext.h"
-#include "boost/ripple_SslContext.h"
+//#include "sockets/ripple_MultiSocket.h"
 
 }
 

modules/ripple_asio/ripple_asio_fwdecl.h

@@ -1,32 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_ASIO_FWDECL_H_INCLUDED
-#define RIPPLE_ASIO_FWDECL_H_INCLUDED
-
-/** Forward declarations for boost::asio.
-
-    These allow the header material for boost::asio to be omitted for
-    most translation units.
-*/
-
-namespace boost {
-
-namespace asio {
-
-class io_service;
-
-namespace ssl {
-
-class context;
-
-}
-
-}
-
-}
-
-#endif

modules/ripple_asio/ripple_asio_impl.h

@@ -1,35 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_ASIO_IMPL_H_INCLUDED
-#define RIPPLE_ASIO_IMPL_H_INCLUDED
-
-#include <boost/version.hpp>
-
-// Once everything is converted, these can be moved to ripple_asio.cpp
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/ssl.hpp>
-
-#include <boost/asio.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/bind.hpp>
-#include <boost/array.hpp>
-#include <boost/foreach.hpp>
-#include <boost/unordered_map.hpp> // for unit test
-#include <boost/mpl/at.hpp>
-#include <boost/mpl/vector.hpp>
-
-/** Implementations for boost::asio abstractions.
-
-    These require boost::asio header material to be included.
-*/
-
-namespace ripple
-{
-
-}
-
-#endif

modules/ripple_asio/sockets/ripple_MultiSocket.cpp

@@ -182,7 +182,7 @@ public:
     {
         check_precondition (! MultiSocket::Flag (extraClientFlags).any_set (MultiSocket::Flag::client_role | MultiSocket::Flag::server_role));
 
-#if 1
+#if 0
         run <Protocol> (MultiSocket::Flag::client_role | extraClientFlags, MultiSocket::Flag::server_role | extraServerFlags);
 #else
         run_async <Protocol> (MultiSocket::Flag::client_role | extraClientFlags, MultiSocket::Flag::server_role | extraServerFlags);
@@ -192,7 +192,7 @@ public:
     template <typename Protocol>
     void testProtocol ()
     {
-#if 1
+#if 0
         // These should pass.
         run <Protocol> (0, 0);
         run <Protocol> (MultiSocket::Flag::client_role, 0);
@@ -204,8 +204,8 @@ public:
         // These should pass
         testFlags <Protocol> (MultiSocket::Flag::ssl, MultiSocket::Flag::ssl_required);
         testFlags <Protocol> (0, MultiSocket::Flag::ssl);
-        testFlags <Protocol> (MultiSocket::Flag::ssl, MultiSocket::Flag::ssl);
 #endif
+        testFlags <Protocol> (MultiSocket::Flag::ssl, MultiSocket::Flag::ssl);
     }
 
     void runTest ()

modules/ripple_asio/sockets/ripple_MultiSocketType.h

@@ -18,12 +18,6 @@ private:
     typedef typename boost::remove_reference <Stream>::type stream_type;
 
 public:
-#if 0
-    struct SocketInterfaces
-        : SocketInterface::Handshake
-    { };
-#endif
-
     template <typename Arg>
     ssl_detector (Arg& arg)
         : m_next_layer (arg)
@@ -108,7 +102,6 @@ private:
 template <class StreamSocket>
 class MultiSocketType
     : public MultiSocket
-    , protected SocketWrapperBasics
 {
 public:
     typedef typename boost::remove_reference <StreamSocket>::type next_layer_type;

modules/ripple_net/ripple_net.cpp

@@ -17,8 +17,6 @@
 // VFALCO TODO Remove this dependency on theConfig
 #include "../modules/ripple_core/ripple_core.h" // theConfig for HttpsClient
 
-#include "beast/modules/beast_asio/beast_asio.h"
-
 namespace ripple
 {
 

modules/ripple_websocket/autosocket/ripple_AutoSocket.h

@@ -24,13 +24,6 @@ public:
     typedef boost::function<void (error_code)>       callback;
 
 public:
-#if 0
-    struct SocketInterfaces
-        : beast::SocketInterface::AsyncStream
-        , beast::SocketInterface::AsyncHandshake
-        , beast::SocketInterface::LowestLayer { };
-#endif
-
     AutoSocket (boost::asio::io_service& s, boost::asio::ssl::context& c)
         : mSecure (false)
         , mBuffer (4)

modules/ripple_websocket/ripple_websocket.h

@@ -34,9 +34,6 @@
 //
 #include "../modules/ripple_basics/ripple_basics.h"
 
-// This should be in the .cpp
-#include "beast/modules/beast_asio/beast_asio.h"
-
 //------------------------------------------------------------------------------
 
 #include "websocket/src/common.hpp"