Tidy up move obsolete and deprecated files

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 "boost/ripple_SslContext.h"
+//#include "sockets/ripple_TlsContext.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"