Merge ripple_asio into ripple_net

modules/ripple_app/ripple_app.cpp

@@ -344,13 +344,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 
 #if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 5
 
-// VFALCO This hack lets me compile just ripple_app_pt5.cpp when
-//        ripple_asio.h and relatives change.
-}
-#include "../ripple_asio/ripple_asio.h"
-namespace ripple
-{
-
 #include "ledger/LedgerTiming.cpp"
 #include "ledger/ripple_AcceptedLedgerTx.cpp"
 #include "main/ripple_Application.cpp"

modules/ripple_asio/ripple_asio.cpp

@@ -1,43 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-/** Add this to get the @ref ripple_asio module.
-
-    @file ripple_asio.cpp
-    @ingroup ripple_asio
-*/
-
-//------------------------------------------------------------------------------
-
-#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_asio/beast_asio.h"
-
-#include "ripple_asio.h"
-
-namespace ripple
-{
-
-#include "sockets/ripple_MultiSocketType.h"
-#include "sockets/RippleSSLContext.cpp"
-#include "sockets/ripple_MultiSocket.cpp"
-
-}

modules/ripple_asio/ripple_asio.h

@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_ASIO_H_INCLUDED
-#define RIPPLE_ASIO_H_INCLUDED
-
-#include "beast/modules/beast_asio/beast_asio.h"
-
-namespace ripple
-{
-
-using namespace beast;
-
-#include "sockets/RippleSSLContext.h"
-#include "sockets/ripple_MultiSocket.h"
-
-}
-
-#endif

modules/ripple_net/ripple_net.cpp

@@ -12,6 +12,23 @@
 
 #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_asio/beast_asio.h"
+
 #include "ripple_net.h"
 
 // VFALCO TODO Remove this dependency on theConfig
@@ -20,6 +37,10 @@
 namespace ripple
 {
 
+#include "basics/ripple_MultiSocketType.h" // private
+#include "basics/RippleSSLContext.cpp"
+#include "basics/ripple_MultiSocket.cpp"
+
 #include "basics/ripple_HTTPRequest.cpp"
 #include "basics/ripple_HttpsClient.cpp"
 #include "basics/ripple_RPCServer.cpp"

modules/ripple_net/ripple_net.h

@@ -7,18 +7,7 @@
 #ifndef RIPPLE_NET_H_INCLUDED
 #define RIPPLE_NET_H_INCLUDED
 
-/** Include this to get the @ref ripple_net module.
-
-    @file ripple_net.h
-    @ingroup ripple_net
-*/
-
-/** Network classes.
-
-    This module provides classes that handle all network activities.
-
-    @defgroup ripple_net
-*/
+#include "beast/modules/beast_asio/beast_asio.h"
 
 #include "../ripple_basics/ripple_basics.h"
 
@@ -27,6 +16,8 @@
 namespace ripple
 {
 
+#include "basics/RippleSSLContext.h"
+#include "basics/ripple_MultiSocket.h"
 #include "basics/ripple_HTTPRequest.h"
 #include "basics/ripple_HttpsClient.h"
 #include "basics/ripple_RPCServer.h"