Tidy up move obsolete and deprecated files

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" />

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>

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"

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:

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