Remove obsolete beast_Function

Builds/VisualStudio2012/beast.vcxproj

@@ -173,8 +173,6 @@
     <ClInclude Include="..\..\modules\beast_core\files\beast_MemoryMappedFile.h" />
     <ClInclude Include="..\..\modules\beast_core\files\beast_RandomAccessFile.h" />
     <ClInclude Include="..\..\modules\beast_core\files\beast_TemporaryFile.h" />
-    <ClInclude Include="..\..\modules\beast_core\functional\beast_Function.h" />
-    <ClInclude Include="..\..\modules\beast_core\functional\SharedFunction.h" />
     <ClInclude Include="..\..\modules\beast_core\json\beast_JSON.h" />
     <ClInclude Include="..\..\modules\beast_core\logging\beast_FileLogger.h" />
     <ClInclude Include="..\..\modules\beast_core\logging\beast_Logger.h" />
@@ -209,6 +207,7 @@
     <ClInclude Include="..\..\modules\beast_core\memory\beast_OptionalScopedPointer.h" />
     <ClInclude Include="..\..\modules\beast_core\memory\beast_PagedFreeStore.h" />
     <ClInclude Include="..\..\modules\beast_core\memory\beast_RecycledObjectPool.h" />
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h" />
     <ClInclude Include="..\..\modules\beast_core\memory\SharedObject.h" />
     <ClInclude Include="..\..\modules\beast_core\memory\beast_ScopedPointer.h" />
     <ClInclude Include="..\..\modules\beast_core\memory\SharedSingleton.h" />

Builds/VisualStudio2012/beast.vcxproj.filters

@@ -149,9 +149,6 @@
     <Filter Include="beast_core\thread\impl">
       <UniqueIdentifier>{91538dcf-b219-4c80-9861-bb4949089775}</UniqueIdentifier>
     </Filter>
-    <Filter Include="beast_core\functional">
-      <UniqueIdentifier>{5df65855-1ccd-4997-97c1-f9788924ee2b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="beast_extras">
       <UniqueIdentifier>{2f5b95a8-1adf-4319-8464-ddc2b2e03f0b}</UniqueIdentifier>
     </Filter>
@@ -737,9 +734,6 @@
     <ClInclude Include="..\..\modules\beast_core\maths\beast_Math.h">
       <Filter>beast_core\maths</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\functional\beast_Function.h">
-      <Filter>beast_core\functional</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_core\memory\beast_AllocatedBy.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
@@ -962,9 +956,6 @@
     <ClInclude Include="..\..\modules\beast_asio\protocol\PrefilledReadStream.h">
       <Filter>beast_asio\protocol</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\beast_core\functional\SharedFunction.h">
-      <Filter>beast_core\functional</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\beast_asio\basics\ContentBodyBuffer.h">
       <Filter>beast_asio\basics</Filter>
     </ClInclude>
@@ -1034,6 +1025,9 @@
     <ClInclude Include="..\..\modules\beast_crypto\math\BinaryEncoding.h">
       <Filter>beast_crypto\math</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h">
+      <Filter>beast_core\memory</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">

modules/beast_core/beast_core.h

@@ -319,7 +319,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
 #include "diagnostic/beast_FPUFlags.h"
 #include "memory/SharedObject.h"
 #include "memory/SharedPtr.h"
-#include "functional/SharedFunction.h"
+#include "memory/SharedFunction.h"
 #include "diagnostic/ProtectedCall.h"
 #include "containers/beast_AbstractFifo.h"
 #include "text/beast_Identifier.h"
@@ -407,8 +407,6 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
 
 #include "diagnostic/MeasureFunctionCallTime.h"
 
-#include "functional/beast_Function.h"
-
 #include "thread/beast_DeadlineTimer.h"
 
 #include "memory/beast_AllocatedBy.h"

modules/beast_core/functional/beast_Function.h

@@ -1,266 +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_FUNCTION_H_INCLUDED
-#define BEAST_FUNCTION_H_INCLUDED
-
-//
-// Strong replacement for boost::function:
-//
-// #1 Bounded memory requirement, avoids the free store.
-//
-// #2 Always refers to a functor (i.e. is never invalid)
-//
-// #3 Default value (None) is a function that
-//    returns a default object (the result type
-//    constructed with a default constructor).
-//
-
-template <typename Signature, int Bytes = 128>
-class Function;
-
-//
-// nullary function
-//
-
-template <typename R, int Bytes>
-class Function <R (void), Bytes>
-{
-public:
-    typedef R result_type;
-    typedef Function self_type;
-
-    struct None
-    {
-        typedef R result_type;
-        result_type operator () () const
-        {
-            return result_type ();
-        }
-    };
-
-    Function ()
-    {
-        constructCopyOf (None ());
-    }
-
-    Function (Function const& f)
-    {
-        f.getCall ().constructCopyInto (m_storage);
-    }
-
-    template <class Functor>
-    Function (Functor const& f)
-    {
-        constructCopyOf (f);
-    }
-
-    ~Function ()
-    {
-        getCall ().~Call ();
-    }
-
-    Function& operator= (Function const& f)
-    {
-        getCall ().~Call ();
-        f.getCall ().constructCopyInto (m_storage);
-        return *this;
-    }
-
-    template <class Functor>
-    Function& operator= (Functor const& f)
-    {
-        getCall ().~Call ();
-        constructCopyOf (f);
-        return *this;
-    }
-
-    result_type operator () ()
-    {
-        return getCall ().operator () ();
-    }
-
-private:
-    template <class Functor>
-    void constructCopyOf (Functor const& f)
-    {
-        // If this generates a compile error it means that
-        // the functor is too large for the static buffer.
-        // Increase the storage template parameter until
-        // the error message goes away. This might cause
-        // changes throughout the application with other
-        // template classes that depend on the size.
-        static_bassert (sizeof (StoredCall <Functor>) <= Bytes);
-        new (m_storage) StoredCall <Functor> (f);
-    }
-
-private:
-    struct Call
-    {
-        virtual ~Call () {}
-        virtual void constructCopyInto (void* p) const = 0;
-        virtual result_type operator () () = 0;
-    };
-
-    template <class Functor>
-    struct StoredCall : Call
-    {
-        explicit StoredCall (Functor const& f) : m_f (f) { }
-        StoredCall (const StoredCall& c) : m_f (c.m_f) { }
-        void constructCopyInto (void* p) const
-        {
-            new (p) StoredCall (m_f);
-        }
-        result_type operator () ()
-        {
-            return m_f ();
-        }
-    private:
-        Functor m_f;
-    };
-
-    Call& getCall ()
-    {
-        return *reinterpret_cast <Call*> (&m_storage[0]);
-    }
-
-    Call const& getCall () const
-    {
-        return *reinterpret_cast <Call const*> (&m_storage[0]);
-    }
-
-    char m_storage [Bytes]; // should be enough
-};
-
-//------------------------------------------------------------------------------
-
-//
-// unary function
-//
-
-template <typename R, typename T1, int Bytes>
-class Function <R (T1 t1), Bytes>
-{
-public:
-    typedef R result_type;
-    typedef Function self_type;
-
-    struct None
-    {
-        typedef R result_type;
-        result_type operator () (T1) const
-        {
-            return result_type ();
-        }
-    };
-
-    Function ()
-    {
-        constructCopyOf (None ());
-    }
-
-    Function (const Function& f)
-    {
-        f.getCall ().constructCopyInto (m_storage);
-    }
-
-    template <class Functor>
-    Function (Functor const& f)
-    {
-        constructCopyOf (f);
-    }
-
-    ~Function ()
-    {
-        getCall ().~Call ();
-    }
-
-    Function& operator= (const Function& f)
-    {
-        getCall ().~Call ();
-        f.getCall ().constructCopyInto (m_storage);
-        return *this;
-    }
-
-    template <class Functor>
-    Function& operator= (Functor const& f)
-    {
-        getCall ().~Call ();
-        constructCopyOf (f);
-        return *this;
-    }
-
-    result_type operator () (T1 t1)
-    {
-        return getCall ().operator () (t1);
-    }
-
-private:
-    template <class Functor>
-    void constructCopyOf (Functor const& f)
-    {
-        // If this generates a compile error it means that
-        // the functor is too large for the static buffer.
-        // Increase the storage template parameter until
-        // the error message goes away. This might cause
-        // changes throughout the application with other
-        // template classes that depend on the size.
-        static_bassert (sizeof (StoredCall <Functor>) <= Bytes);
-        new (m_storage) StoredCall <Functor> (f);
-    }
-
-private:
-    struct Call
-    {
-        virtual ~Call () {}
-        virtual void constructCopyInto (void* p) const = 0;
-        virtual result_type operator () (T1 t1) = 0;
-    };
-
-    template <class Functor>
-    struct StoredCall : Call
-    {
-        explicit StoredCall (Functor const& f) : m_f (f) { }
-        StoredCall (const StoredCall& c) : m_f (c.m_f) { }
-        void constructCopyInto (void* p) const
-        {
-            new (p) StoredCall (m_f);
-        }
-        result_type operator () (T1 t1)
-        {
-            return m_f (t1);
-        }
-    private:
-        Functor m_f;
-    };
-
-    Call& getCall ()
-    {
-        return *reinterpret_cast <Call*> (&m_storage[0]);
-    }
-
-    Call const& getCall () const
-    {
-        return *reinterpret_cast <Call const*> (&m_storage[0]);
-    }
-
-    char m_storage [Bytes]; // should be enough
-};
-
-#endif