Remove obsolete classes:

Legacy workarounds for Visual Studio non thread-safe initialization
of function local objects with static storage duration are removed:

* Remove LeakChecked
* Remove StaticObject
* Remove SharedSingleton

Builds/VisualStudio2013/RippleD.vcxproj

@@ -563,8 +563,6 @@
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\module\core\memory\MemoryBlock.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\memory\SharedSingleton.h">
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\misc\Result.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -1019,16 +1017,11 @@
     <ClCompile Include="..\..\src\beast\beast\utility\impl\Journal.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\utility\impl\LeakChecked.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\impl\PropertyStream.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\maybe_const.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\meta.h">
@@ -1037,8 +1030,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\static_initializer.h">
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\tagged_integer.h">

Builds/VisualStudio2013/RippleD.vcxproj.filters

@@ -1140,9 +1140,6 @@
     <ClInclude Include="..\..\src\beast\beast\module\core\memory\MemoryBlock.h">
       <Filter>beast\module\core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\module\core\memory\SharedSingleton.h">
-      <Filter>beast\module\core\memory</Filter>
-    </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\module\core\misc\Result.cpp">
       <Filter>beast\module\core\misc</Filter>
     </ClCompile>
@@ -1728,18 +1725,12 @@
     <ClCompile Include="..\..\src\beast\beast\utility\impl\Journal.cpp">
       <Filter>beast\utility\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\beast\beast\utility\impl\LeakChecked.cpp">
-      <Filter>beast\utility\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\beast\beast\utility\impl\PropertyStream.cpp">
       <Filter>beast\utility\impl</Filter>
     </ClCompile>
     <ClInclude Include="..\..\src\beast\beast\utility\Journal.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\LeakChecked.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\maybe_const.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
@@ -1752,9 +1743,6 @@
     <ClInclude Include="..\..\src\beast\beast\utility\PropertyStream.h">
       <Filter>beast\utility</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\utility\StaticObject.h">
-      <Filter>beast\utility</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\utility\static_initializer.h">
       <Filter>beast\utility</Filter>
     </ClInclude>

src/BeastConfig.h

@@ -59,8 +59,6 @@
 
 /** Config: BEAST_CHECK_MEMORY_LEAKS
     Enables a memory-leak check for certain objects when the app terminates.
-    See the LeakChecked class for more details about enabling leak checking for
-    specific classes.
 */
 #ifndef   BEAST_CHECK_MEMORY_LEAKS
 //#define BEAST_CHECK_MEMORY_LEAKS 0

src/beast/beast/module/core/core.h

@@ -52,9 +52,7 @@
 #include <beast/utility/Debug.h>
 #include <beast/utility/Error.h>
 #include <beast/utility/Journal.h>
-#include <beast/utility/LeakChecked.h>
 #include <beast/utility/PropertyStream.h>
-#include <beast/utility/StaticObject.h>
 
 #include <beast/module/core/system/StandardIncludes.h>
 
@@ -144,7 +142,6 @@ class FileOutputStream;
 #include <beast/module/core/streams/FileInputSource.h>
 #include <beast/module/core/streams/OutputStream.h>
 #include <beast/module/core/files/FileOutputStream.h>
-#include <beast/module/core/memory/SharedSingleton.h>
 #include <beast/module/core/streams/MemoryOutputStream.h>
 
 #include <beast/module/core/system/SystemStats.h>

src/beast/beast/module/core/files/DirectoryIterator.h

@@ -41,7 +41,7 @@ namespace beast {
 
     It can also guess how far it's got using a wildly inaccurate algorithm.
 */
-class DirectoryIterator : LeakChecked <DirectoryIterator>
+class DirectoryIterator
 {
 public:
     //==============================================================================
@@ -119,7 +119,7 @@ public:
 
 private:
     //==============================================================================
-    class NativeIterator : LeakChecked <NativeIterator>
+    class NativeIterator
     {
     public:
         NativeIterator (const File& directory, const String& wildCard);

src/beast/beast/module/core/files/File.cpp

@@ -22,29 +22,16 @@
 //==============================================================================
 
 #include <beast/unit_test/suite.h>
-
+#include <beast/utility/static_initializer.h>
 #include <algorithm>
 #include <memory>
 
 namespace beast {
 
-// We need to make a shared singleton or else there are
+File const& File::nonexistent()
-// issues with the leak detector and order of detruction.
-//
-class NonexistentHolder
 {
-public:
+    static beast::static_initializer<File> instance;
-    static NonexistentHolder* getInstance()
+    return *instance;
-    {
-        return SharedSingleton <NonexistentHolder>::getInstance();
-    }
-
-    File file;
-};
-
-File const& File::nonexistent ()
-{
-    return NonexistentHolder::getInstance ()->file;
 }
 
 //------------------------------------------------------------------------------

src/beast/beast/module/core/files/FileInputStream.h

@@ -35,7 +35,6 @@ namespace beast
 */
 class FileInputStream
     : public InputStream
-    , LeakChecked <FileInputStream>
 {
 public:
     //==============================================================================

src/beast/beast/module/core/files/FileOutputStream.h

@@ -35,7 +35,6 @@ namespace beast
 */
 class FileOutputStream
     : public OutputStream
-    , LeakChecked <FileOutputStream>
 {
 public:
     //==============================================================================

src/beast/beast/module/core/memory/MemoryBlock.h

@@ -25,7 +25,6 @@
 #define BEAST_MODULE_CORE_MEMORY_MEMORYBLOCK_H_INCLUDED
 
 #include <beast/HeapBlock.h>
-#include <beast/utility/LeakChecked.h>
 #include <beast/strings/String.h>
 
 namespace beast {
@@ -35,7 +34,7 @@ namespace beast {
     A class to hold a resizable block of raw data.
 
 */
-class MemoryBlock : LeakChecked <MemoryBlock>
+class MemoryBlock
 {
 public:
     //==============================================================================

src/beast/beast/module/core/memory/SharedSingleton.h

@@ -1,205 +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_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED
-#define BEAST_MODULE_CORE_MEMORY_SHAREDSINGLETON_H_INCLUDED
-
-#include <beast/threads/SpinLock.h>
-#include <beast/smart_ptr/SharedPtr.h>
-#include <beast/module/core/time/AtExitHook.h>
-
-#include <atomic>
-
-namespace beast
-{
-
-/** Thread-safe singleton which comes into existence on first use. Use this
-    instead of creating objects with static storage duration. These singletons
-    are automatically reference counted, so if you hold a pointer to it in every
-    object that depends on it, the order of destruction of objects is assured
-    to be correct.
-
-    Object Requirements:
-        DefaultConstructible
-        TriviallyDestructible (when lifetime == neverDestroyed)
-        Destructible
-
-    @class SharedSingleton
-    @ingroup beast_core
-*/
-/** @{ */
-class SingletonLifetime
-{
-public:
-    // It would be nice if we didn't have to qualify the enumeration but
-    // Argument Dependent Lookup is inapplicable here because:
-    //
-    // "Base classes dependent on a template parameter aren't part of lookup."
-    //  - ville
-    //
-
-    /** Construction options for SharedSingleton
-
-        @ingroup beast_core
-    */
-    enum Lifetime
-    {
-        /** Created on first use, destroyed when the last reference is removed.
-        */
-        createOnDemand,
-
-        /** The singleton is created on first use and persists until program exit.
-        */
-        persistAfterCreation,
-
-        /** The singleton is created when needed and never destroyed.
-
-            This is useful for applications which do not have a clean exit.
-        */
-        neverDestroyed
-    };
-};
-
-//------------------------------------------------------------------------------
-
-/** Wraps object to produce a reference counted singleton. */
-template <class Object>
-class SharedSingleton
-    : public Object
-    , private SharedObject
-{
-public:
-    typedef SharedPtr <SharedSingleton <Object> > Ptr;
-
-    static Ptr get (SingletonLifetime::Lifetime lifetime
-        = SingletonLifetime::persistAfterCreation)
-    {
-        StaticData& staticData (getStaticData ());
-        SharedSingleton* instance = staticData.instance;
-        if (instance == nullptr)
-        {
-            std::lock_guard <LockType> lock (staticData.mutex);
-            instance = staticData.instance;
-            if (instance == nullptr)
-            {
-                bassert (lifetime == SingletonLifetime::createOnDemand || ! staticData.destructorCalled);
-                staticData.instance = &staticData.object;
-                new (staticData.instance) SharedSingleton (lifetime);
-                std::atomic_thread_fence (std::memory_order_seq_cst);
-                instance = staticData.instance;
-            }
-        }
-        return instance;
-    }
-
-    // DEPRECATED LEGACY FUNCTION NAME
-    static Ptr getInstance (SingletonLifetime::Lifetime lifetime
-        = SingletonLifetime::persistAfterCreation)
-    {
-        return get (lifetime);
-    }
-
-private:
-    explicit SharedSingleton (SingletonLifetime::Lifetime lifetime)
-        : m_lifetime (lifetime)
-        , m_exitHook (this)
-    {
-        if (m_lifetime == SingletonLifetime::persistAfterCreation ||
-            m_lifetime == SingletonLifetime::neverDestroyed)
-            this->incReferenceCount ();
-    }
-
-    ~SharedSingleton ()
-    {
-    }
-
-    void onExit ()
-    {
-        if (m_lifetime == SingletonLifetime::persistAfterCreation)
-            this->decReferenceCount ();
-    }
-
-    void destroy () const
-    {
-        bool callDestructor;
-
-        // Handle the condition where one thread is releasing the last
-        // reference just as another thread is trying to acquire it.
-        //
-        {
-            StaticData& staticData (getStaticData ());
-            std::lock_guard <LockType> lock (staticData.mutex);
-
-            if (this->getReferenceCount() != 0)
-            {
-                callDestructor = false;
-            }
-            else
-            {
-                callDestructor = true;
-                staticData.instance = nullptr;
-                staticData.destructorCalled = true;
-            }
-        }
-
-        if (callDestructor)
-        {
-            bassert (m_lifetime != SingletonLifetime::neverDestroyed);
-
-            this->~SharedSingleton();
-        }
-    }
-
-    typedef SpinLock LockType;
-
-    // This structure gets zero-filled at static initialization time.
-    // No constructors are called.
-    //
-    class StaticData
-    {
-    public:
-        LockType mutex;
-        SharedSingleton* instance;
-        SharedSingleton  object;
-        bool destructorCalled;
-
-        StaticData() = delete;
-        StaticData(StaticData const&) = delete;
-        StaticData& operator= (StaticData const&) = delete;
-        ~StaticData() = delete;
-    };
-
-    static StaticData& getStaticData ()
-    {
-        static std::uint8_t storage [sizeof (StaticData)];
-        return *(reinterpret_cast <StaticData*> (&storage [0]));
-    }
-
-    friend class SharedPtr <SharedSingleton>;
-    friend class AtExitMemberHook <SharedSingleton>;
-
-    SingletonLifetime::Lifetime m_lifetime;
-    AtExitMemberHook <SharedSingleton> m_exitHook;
-};
-
-//------------------------------------------------------------------------------
-
-} // beast
-
-#endif

src/beast/beast/module/core/native/win32_Files.cpp

@@ -399,7 +399,6 @@ bool File::setAsCurrentWorkingDirectory() const
 
 //==============================================================================
 class DirectoryIterator::NativeIterator::Pimpl
-    : LeakChecked <DirectoryIterator::NativeIterator::Pimpl>
 {
 public:
     Pimpl (const File& directory, const String& wildCard)

src/beast/beast/module/core/streams/FileInputSource.h

@@ -35,7 +35,6 @@ namespace beast
 */
 class FileInputSource
     : public InputSource
-    , LeakChecked <FileInputSource>
 {
 public:
     //==============================================================================

src/beast/beast/module/core/streams/InputSource.h

@@ -36,7 +36,7 @@ namespace beast
 
     @see FileInputSource
 */
-class InputSource : LeakChecked <InputSource>
+class InputSource
 {
 public:
     //==============================================================================

src/beast/beast/module/core/streams/InputStream.h

@@ -38,7 +38,6 @@ class MemoryBlock;
     @see OutputStream, FileInputStream
 */
 class InputStream
-    : LeakChecked <InputStream>
 {
 public:
     /** Destructor. */

src/beast/beast/module/core/streams/MemoryOutputStream.h

@@ -43,8 +43,7 @@ namespace beast
 */
 class  MemoryOutputStream
     : public OutputStream
-    , LeakChecked <MemoryOutputStream>
+{    
-{
 public:
     //==============================================================================
     /** Creates an empty memory stream, ready to be written into.

src/beast/beast/module/core/thread/DeadlineTimer.cpp

@@ -17,12 +17,13 @@
 */
 //==============================================================================
 
+#include <beast/utility/static_initializer.h>
+
 namespace beast
 {
 
 class DeadlineTimer::Manager
-    : public LeakChecked <Manager>
+    : protected Thread
-    , protected Thread
 {
 private:
     typedef CriticalSection LockType;
@@ -42,6 +43,14 @@ public:
         bassert (m_items.empty ());
     }
 
+    static
+    Manager&
+    instance()
+    {
+        static beast::static_initializer<Manager> m;
+        return *m;
+    }
+
     // Okay to call on an active timer.
     // However, an extra notification may still happen due to concurrency.
     //
@@ -210,19 +219,18 @@ private:
 
 DeadlineTimer::DeadlineTimer (Listener* listener)
     : m_listener (listener)
-    , m_manager (SharedSingleton <Manager>::getInstance ())
     , m_isActive (false)
 {
 }
 
 DeadlineTimer::~DeadlineTimer ()
 {
-    m_manager->deactivate (*this);
+    Manager::instance().deactivate (*this);
 }
 
 void DeadlineTimer::cancel ()
 {
-    m_manager->deactivate (*this);
+    Manager::instance().deactivate (*this);
 }
 
 void DeadlineTimer::setExpiration (double secondsUntilDeadline)
@@ -232,7 +240,7 @@ void DeadlineTimer::setExpiration (double secondsUntilDeadline)
     RelativeTime const when (
         RelativeTime::fromStartup() + secondsUntilDeadline);
 
-    m_manager->activate (*this, 0, when);
+    Manager::instance().activate (*this, 0, when);
 }
 
 void DeadlineTimer::setRecurringExpiration (double secondsUntilDeadline)
@@ -242,7 +250,7 @@ void DeadlineTimer::setRecurringExpiration (double secondsUntilDeadline)
     RelativeTime const when (
         RelativeTime::fromStartup() + secondsUntilDeadline);
 
-    m_manager->activate (*this, secondsUntilDeadline, when);
+    Manager::instance().activate (*this, secondsUntilDeadline, when);
 }
 
 } // beast

src/beast/beast/module/core/thread/DeadlineTimer.h

@@ -20,8 +20,6 @@
 #ifndef BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED
 #define BEAST_MODULE_CORE_THREAD_DEADLINETIMER_H_INCLUDED
 
-#include <beast/module/core/memory/SharedSingleton.h>
-
 namespace beast {
 
 /** Provides periodic or one time notifications at a specified time interval.
@@ -108,7 +106,6 @@ private:
     class Manager;
 
     Listener* const m_listener;
-    SharedPtr <SharedSingleton <Manager> > m_manager;
     bool m_isActive;
     RelativeTime m_notificationTime;
     double m_secondsRecurring; // non zero if recurring

src/beast/beast/module/core/time/AtExitHook.cpp

@@ -17,8 +17,9 @@
 */
 //==============================================================================
 
-namespace beast
+#include <beast/utility/static_initializer.h>
-{
+
+namespace beast {
 
 // Manages the list of hooks, and calls
 // whoever is in the list at exit time.
@@ -33,7 +34,9 @@ public:
 
     static inline Manager& get ()
     {
-        return StaticObject <Manager>::get();
+        static beast::static_initializer<
+            Manager> instance;
+        return *instance;
     }
 
     void insert (Item& item)
@@ -73,10 +76,6 @@ private:
             AtExitHook* const hook (item.hook ());
             hook->onExit ();
         }
-
-        // Now do the leak checking
-        //
-        LeakCheckedBase::checkForLeaks ();
     }
 
     struct StaticDestructor

src/beast/beast/module/sqdb/api/session.h

@@ -61,7 +61,6 @@
 #define BEAST_MODULE_SQDB_API_SESSION_H_INCLUDED
 
 #include <beast/smart_ptr/SharedPtr.h>
-#include <beast/module/core/memory/SharedSingleton.h>
 
 namespace beast {
 namespace sqdb {
@@ -137,8 +136,6 @@ private:
     Error hard_exec(std::string const& query);
 
 private:
-    class Sqlite3;
-    SharedPtr <SharedSingleton <Sqlite3> > m_instance;
     bool m_bInTransaction;
     sqlite3* m_connection;
     String m_fileName;

src/beast/beast/module/sqdb/source/session.cpp

@@ -62,26 +62,27 @@
 namespace beast {
 namespace sqdb {
 
-class session::Sqlite3
+class Sqlite3Instance
 {
 public:
-    Sqlite3()
+    Sqlite3Instance()
     {
         assert (sqlite3_threadsafe() != 0);
         sqlite3_initialize();
     }
 
-    ~Sqlite3()
+    ~Sqlite3Instance()
     {
         sqlite3_shutdown();
     }
 };
 
+Sqlite3Instance sqlite3_instance;
+
 //------------------------------------------------------------------------------
 
 session::session()
     : prepare (this)
-    , m_instance (SharedSingleton <Sqlite3>::getInstance ())
     , m_bInTransaction (false)
     , m_connection (nullptr)
 {
@@ -89,7 +90,6 @@ session::session()
 
 session::session(const session& deferredClone)
     : prepare (this)
-    , m_instance (SharedSingleton <Sqlite3>::getInstance ())
     , m_bInTransaction (false)
     , m_connection (nullptr)
     , m_fileName (deferredClone.m_fileName)

src/beast/beast/threads/Thread.h

@@ -24,7 +24,6 @@
 #ifndef BEAST_THREADS_THREAD_H_INCLUDED
 #define BEAST_THREADS_THREAD_H_INCLUDED
 
-#include <beast/utility/LeakChecked.h>
 #include <beast/threads/RecursiveMutex.h>
 #include <beast/threads/WaitableEvent.h>
 
@@ -43,7 +42,7 @@ namespace beast {
     @see CriticalSection, WaitableEvent, Process, ThreadWithProgressWindow,
          MessageManagerLock
 */
-class Thread : LeakChecked <Thread>
+class Thread
 {
 public:
     //==============================================================================

src/beast/beast/threads/WaitableEvent.h

@@ -38,7 +38,6 @@ namespace beast {
     method.
 */
 class WaitableEvent
-    //, LeakChecked <WaitableEvent> // VFALCO TODO Move LeakChecked to beast/
 {
 public:
     //==============================================================================

src/beast/beast/utility/LeakChecked.h

@@ -1,181 +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_UTILITY_LEAKCHECKED_H_INCLUDED
-#define BEAST_UTILITY_LEAKCHECKED_H_INCLUDED
-
-#include <beast/Config.h>
-#include <beast/intrusive/LockFreeStack.h>
-#include <beast/utility/StaticObject.h>
-
-#include <atomic>
-
-namespace beast {
-
-namespace detail {
-
-class LeakCheckedBase
-{
-public:
-    static void checkForLeaks ();
-
-protected:
-    class LeakCounterBase : public LockFreeStack <LeakCounterBase>::Node
-    {
-    public:
-        LeakCounterBase ();
-
-        virtual ~LeakCounterBase ()
-        {
-        }
-
-        inline int increment ()
-        {
-            return ++m_count;
-        }
-
-        inline int decrement ()
-        {
-            return --m_count;
-        }
-
-        virtual char const* getClassName () const = 0;
-
-    private:
-        void checkForLeaks ();
-        virtual void checkPureVirtual () const = 0;
-
-        class Singleton;
-        friend class LeakCheckedBase;
-
-        std::atomic <int> m_count;
-    };
-
-    static void reportDanglingPointer (char const* objectName);
-};
-
-//------------------------------------------------------------------------------
-
-/** Detects leaks at program exit.
-
-    To use this, derive your class from this template using CRTP (curiously
-    recurring template pattern).
-*/
-template <class Object>
-class LeakChecked : private LeakCheckedBase
-{
-protected:
-    LeakChecked () noexcept
-    {
-        getCounter ().increment ();
-    }
-
-    LeakChecked (LeakChecked const&) noexcept
-    {
-        getCounter ().increment ();
-    }
-
-    ~LeakChecked ()
-    {
-        if (getCounter ().decrement () < 0)
-        {
-            reportDanglingPointer (getLeakCheckedName ());
-        }
-    }
-
-private:
-    // Singleton that maintains the count of this object
-    //
-    class LeakCounter : public LeakCounterBase
-    {
-    public:
-        LeakCounter () noexcept
-        {
-        }
-
-        char const* getClassName () const
-        {
-            return getLeakCheckedName ();
-        }
-
-        void checkPureVirtual () const { }
-    };
-
-private:
-    /* Due to a bug in Visual Studio 10 and earlier, the string returned by
-       typeid().name() will appear to leak on exit. Therefore, we should
-       only call this function when there's an actual leak, or else there
-       will be spurious leak notices at exit.
-    */
-    static const char* getLeakCheckedName ()
-    {
-        return typeid (Object).name ();
-    }
-
-    // Retrieve the singleton for this object
-    //
-    static LeakCounter& getCounter () noexcept
-    {
-        return StaticObject <LeakCounter>::get();
-    }
-};
-
-}
-
-//------------------------------------------------------------------------------
-
-namespace detail
-{
-
-namespace disabled
-{
-
-class LeakCheckedBase
-{
-public:
-    static void checkForLeaks ()
-    {
-    }
-};
-
-template <class Object>
-class LeakChecked : public LeakCheckedBase
-{
-public:
-};
-
-}
-
-}
-
-//------------------------------------------------------------------------------
-
-// Lift the appropriate implementation into our namespace
-//
-#if BEAST_CHECK_MEMORY_LEAKS
-using detail::LeakChecked;
-using detail::LeakCheckedBase;
-#else
-using detail::disabled::LeakChecked;
-using detail::disabled::LeakCheckedBase;
-#endif
-
-}
-
-#endif

src/beast/beast/utility/StaticObject.h

@@ -1,124 +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_UTILITY_STATICOBJECT_H_INCLUDED
-#define BEAST_UTILITY_STATICOBJECT_H_INCLUDED
-
-#include <atomic>
-#include <chrono>
-#include <thread>
-
-namespace beast {
-
-// Spec: N2914=09-0104
-//
-// [3.6.2] Initialization of non-local objects
-//
-//         Objects with static storage duration (3.7.1) or thread storage
-//         duration (3.7.2) shall be zero-initialized (8.5) before any
-//         other initialization takes place.
-//
-
-/** Wrapper to produce an object with static storage duration.
-    
-    The object is constructed in a thread-safe fashion when the get function
-    is first called. Note that the destructor for Object is never called. To
-    invoke the destructor, use the AtExitHook facility (with caution).
-
-    The Tag parameter allows multiple instances of the same Object type, by
-    using different tags.
-
-    Object must meet these requirements:
-        DefaultConstructible
-
-    @see AtExitHook
-*/
-template <class Object, typename Tag = void>
-class StaticObject
-{
-public:
-    static Object& get ()
-    {
-        StaticData& staticData (StaticData::get());
-
-        if (staticData.state.load () != initialized)
-        {
-            if (staticData.state.exchange (initializing) == uninitialized)
-            {
-                // Initialize the object.
-                new (&staticData.object) Object;
-                staticData.state = initialized;
-            }
-            else
-            {
-                std::size_t n = 0;
-
-                while (staticData.state.load () != initialized)
-                {
-                    ++n;
-
-                    std::this_thread::yield ();
-
-                    if (n > 10)
-                    {
-                        std::chrono::milliseconds duration (1);
-
-                        if (n > 100)
-                            duration *= 10;
-
-                        std::this_thread::sleep_for (duration);
-                    }
-                }
-            }
-        }
-
-        assert (staticData.state.load () == initialized);
-        return staticData.object;
-    }
-
-private:
-    static int const uninitialized = 0;
-    static int const initializing = 1;
-    static int const initialized = 2;
-
-    // This structure gets zero-filled at static initialization time.
-    // No constructors are called.
-    //
-    class StaticData
-    {
-    public:
-        std::atomic <int> state;
-        Object object;
-
-        static StaticData& get ()
-        {
-            static std::uint8_t storage [sizeof (StaticData)];
-            return *(reinterpret_cast <StaticData*> (&storage [0]));
-        }
-
-        StaticData() = delete;
-        StaticData(StaticData const&) = delete;
-        StaticData& operator= (StaticData const&) = delete;
-        ~StaticData() = delete;
-    };
-};
-
-}
-
-#endif

src/beast/beast/utility/Utility.unity.cpp

@@ -25,7 +25,6 @@
 
 #include <beast/utility/impl/Debug.cpp>
 #include <beast/utility/impl/Journal.cpp>
-#include <beast/utility/impl/LeakChecked.cpp>
 #include <beast/utility/impl/PropertyStream.cpp>
 
 #include <beast/utility/tests/bassert.test.cpp>

src/beast/beast/utility/impl/Journal.cpp

@@ -18,7 +18,7 @@
 //==============================================================================
 
 #include <beast/utility/Journal.h>
-#include <beast/module/core/memory/SharedSingleton.h>
+#include <beast/utility/static_initializer.h>
 
 namespace beast {
 
@@ -60,8 +60,8 @@ public:
 
 Journal::Sink& Journal::getNullSink ()
 {
-    return *SharedSingleton <NullJournalSink>::get (
+    static beast::static_initializer<NullJournalSink> sink;
-        SingletonLifetime::neverDestroyed);
+    return *sink;
 }
 
 //------------------------------------------------------------------------------

src/beast/beast/utility/impl/LeakChecked.cpp

@@ -1,102 +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.
-*/
-//==============================================================================
-
-#include <beast/utility/LeakChecked.h>
-
-namespace beast {
-
-namespace detail
-{
-
-class LeakCheckedBase::LeakCounterBase::Singleton
-{
-public:
-    void push_back (LeakCounterBase* counter)
-    {
-        m_list.push_front (counter);
-    }
-
-    void checkForLeaks ()
-    {
-        for (;;)
-        {
-            LeakCounterBase* const counter = m_list.pop_front ();
-
-            if (!counter)
-                break;
-
-            counter->checkForLeaks ();
-        }
-    }
-
-    static Singleton& getInstance ()
-    {
-        static Singleton instance;
-
-        return instance;
-    }
-
-private:
-    friend class LeakCheckedBase;
-
-    LockFreeStack <LeakCounterBase> m_list;
-};
-
-//------------------------------------------------------------------------------
-
-LeakCheckedBase::LeakCounterBase::LeakCounterBase ()
-    : m_count (0)
-{
-    Singleton::getInstance ().push_back (this);
-}
-
-void LeakCheckedBase::LeakCounterBase::checkForLeaks ()
-{
-    // If there's a runtime error from this line, it means there's
-    // an order of destruction problem between different translation units!
-    //
-    this->checkPureVirtual ();
-
-    int const count = m_count.load ();
-
-    if (count > 0)
-    {
-        outputDebugString ("Leaked objects: " + std::to_string (count) + 
-            " instances of " + getClassName ());
-    }
-}
-
-//------------------------------------------------------------------------------
-
-void LeakCheckedBase::reportDanglingPointer (char const* objectName)
-{
-    outputDebugString (std::string ("Dangling pointer deletion: ") + objectName);
-    bassertfalse;
-}
-
-//------------------------------------------------------------------------------
-
-void LeakCheckedBase::checkForLeaks ()
-{
-    LeakCounterBase::Singleton::getInstance ().checkForLeaks ();
-}
-
-}
-
-}

src/ripple/app/data/SqliteDatabase.h

@@ -32,7 +32,6 @@ namespace ripple {
 class SqliteDatabase
     : public Database
     , private beast::Thread
-    , private beast::LeakChecked <SqliteDatabase>
 {
 public:
     explicit SqliteDatabase (char const* host);

src/ripple/app/ledger/InboundLedgers.cpp

@@ -30,7 +30,6 @@ namespace ripple {
 class InboundLedgersImp
     : public InboundLedgers
     , public beast::Stoppable
-    , public beast::LeakChecked <InboundLedgers>
 {
 public:
     typedef std::pair<uint256, InboundLedger::pointer> u256_acq_pair;

src/ripple/app/ledger/LedgerCleaner.cpp

@@ -49,7 +49,6 @@ Cleans up the ledger. Specifically, resolves these issues:
 class LedgerCleanerImp
     : public LedgerCleaner
     , public beast::Thread
-    , public beast::LeakChecked <LedgerCleanerImp>
 {
 public:
     struct State

src/ripple/app/ledger/LedgerMaster.cpp

@@ -49,7 +49,6 @@ namespace ripple {
 
 class LedgerMasterImp
     : public LedgerMaster
-    , public beast::LeakChecked <LedgerMasterImp>
 {
 public:
     typedef std::function <void (Ledger::ref)> callback;

src/ripple/app/ledger/OrderBookDB.h

@@ -28,7 +28,6 @@ namespace ripple {
 
 class OrderBookDB
     : public beast::Stoppable
-    , public beast::LeakChecked <OrderBookDB>
 {
 public:
     explicit OrderBookDB (Stoppable& parent);

src/ripple/app/main/Application.cpp

@@ -105,7 +105,6 @@ class ApplicationImp
     : public ApplicationImpBase
     , public beast::RootStoppable
     , public beast::DeadlineTimer::Listener
-    , public beast::LeakChecked <ApplicationImp>
     , public BasicApp
 {
 private:

src/ripple/app/main/LoadManager.cpp

@@ -28,6 +28,7 @@
 #include <beast/threads/Thread.h>
 #include <beast/cxx14/memory.h> // <memory>
 #include <mutex>
+#include <thread>
 
 namespace ripple {
 

src/ripple/app/misc/NetworkOPs.cpp

@@ -66,7 +66,6 @@ namespace ripple {
 class NetworkOPsImp
     : public NetworkOPs
     , public beast::DeadlineTimer::Listener
-    , public beast::LeakChecked <NetworkOPsImp>
 {
 public:
     enum Fault

src/ripple/app/misc/OrderBook.h

@@ -23,7 +23,7 @@
 namespace ripple {
 
 /** Describes a serialized ledger entry for an order book. */
-class OrderBook : beast::LeakChecked <OrderBook>
+class OrderBook
 {
 public:
     typedef std::shared_ptr <OrderBook> pointer;

src/ripple/app/misc/SHAMapStoreImp.h

@@ -22,14 +22,13 @@
 
 #include <ripple/app/data/DatabaseCon.h>
 #include <ripple/app/misc/SHAMapStore.h>
+#include <ripple/app/misc/NetworkOPs.h>
 #include <ripple/nodestore/impl/Tuning.h>
 #include <ripple/nodestore/DatabaseRotating.h>
 #include <beast/module/sqdb/sqdb.h>
-
 #include <iostream>
 #include <condition_variable>
-
+#include <thread>
-#include "NetworkOPs.h"
 
 namespace ripple {
 

src/ripple/app/misc/Validations.h

@@ -34,7 +34,7 @@ typedef std::pair<int, NodeID> ValidationCounter;
 typedef hash_map<uint256, ValidationCounter> LedgerToValidationCounter;
 typedef std::vector<STValidation::pointer> ValidationVector;
 
-class Validations : beast::LeakChecked <Validations>
+class Validations
 {
 public:
 

src/ripple/app/peers/PeerSet.h

@@ -24,7 +24,6 @@
 #include <ripple/core/Job.h>
 #include <ripple/overlay/Peer.h>
 #include <beast/chrono/abstract_clock.h>
-#include <beast/utility/LeakChecked.h>
 #include <beast/utility/Journal.h>
 #include <boost/asio/deadline_timer.hpp>
 
@@ -34,7 +33,7 @@ namespace ripple {
 
     A peer set is used to acquire a ledger or a transaction set.
 */
-class PeerSet : beast::LeakChecked <PeerSet>
+class PeerSet
 {
 public:
     typedef beast::abstract_clock <std::chrono::steady_clock> clock_type;

src/ripple/app/tx/TransactionMeta.h

@@ -27,7 +27,7 @@
 
 namespace ripple {
 
-class TransactionMetaSet : beast::LeakChecked <TransactionMetaSet>
+class TransactionMetaSet
 {
 public:
     typedef std::shared_ptr<TransactionMetaSet> pointer;

src/ripple/app/websocket/WSDoor.cpp

@@ -46,7 +46,6 @@ namespace ripple {
 class WSDoorImp
     : public WSDoor
     , protected beast::Thread
-    , beast::LeakChecked <WSDoorImp>
 {
 private:
     using LockType = std::recursive_mutex;

src/ripple/app/websocket/WSServerHandler.h

@@ -53,7 +53,6 @@ template <typename endpoint_type>
 class WSServerHandler
     : public WSServerHandlerBase
     , public endpoint_type::handler
-    , public beast::LeakChecked <WSServerHandler <endpoint_type> >
 {
 public:
     typedef typename endpoint_type::handler::connection_ptr     connection_ptr;

src/ripple/basics/CountedObject.h

@@ -20,7 +20,8 @@
 #ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 #define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED
 
-#include <beast/utility/LeakChecked.h>
+#include <beast/utility/noexcept.h>
+#include <beast/utility/static_initializer.h>
 #include <atomic>
 #include <string>
 #include <utility>
@@ -100,7 +101,7 @@ private:
     @ingroup ripple_basics
 */
 template <class Object>
-class CountedObject : beast::LeakChecked <CountedObject <Object> >
+class CountedObject
 {
 public:
     CountedObject ()
@@ -133,9 +134,10 @@ private:
     };
 
 private:
-    static Counter& getCounter ()
+    static Counter& getCounter()
     {
-        return beast::StaticObject <Counter>::get();
+        static beast::static_initializer<Counter> c;
+        return *c;
     }
 };
 

src/ripple/net/impl/HTTPClient.cpp

@@ -24,12 +24,12 @@
 #include <ripple/net/HTTPClient.h>
 #include <ripple/websocket/autosocket/AutoSocket.h>
 #include <beast/asio/placeholders.h>
-#include <beast/module/core/memory/SharedSingleton.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/regex.hpp>
+#include <boost/optional.hpp>
 
 namespace ripple {
 
@@ -77,14 +77,11 @@ private:
     boost::asio::ssl::context m_context;
 };
 
-//------------------------------------------------------------------------------
+boost::optional<HTTPClientSSLContext> httpClientSSLContext;
 
-// VFALCO NOTE I moved the SSL_CONTEXT out of the Config and into this
-//             singleton to eliminate the asio dependency in the headers.
-//
 void HTTPClient::initializeSSLContext ()
 {
-    beast::SharedSingleton <HTTPClientSSLContext>::get();
+    httpClientSSLContext = boost::in_place();
 }
 
 //------------------------------------------------------------------------------
@@ -92,13 +89,12 @@ void HTTPClient::initializeSSLContext ()
 class HTTPClientImp
     : public std::enable_shared_from_this <HTTPClientImp>
     , public HTTPClient
-    , beast::LeakChecked <HTTPClientImp>
 {
 public:
     HTTPClientImp (boost::asio::io_service& io_service,
                               const unsigned short port,
                               std::size_t responseMax)
-        : mSocket (io_service, beast::SharedSingleton <HTTPClientSSLContext>::get()->context())
+        : mSocket (io_service, httpClientSSLContext->context())
         , mResolver (io_service)
         , mHeader (maxClientHeaderBytes)
         , mPort (port)

src/ripple/net/impl/RPCSub.cpp

@@ -30,7 +30,6 @@ namespace ripple {
 // Subscription object for JSON-RPC
 class RPCSubImp
     : public RPCSub
-    , public beast::LeakChecked <RPCSub>
 {
 public:
     RPCSubImp (InfoSub::Source& source, boost::asio::io_service& io_service,

src/ripple/net/impl/SNTPClient.cpp

@@ -65,7 +65,6 @@ static uint8_t SNTPQueryData[48] =
 class SNTPClientImp
     : public SNTPClient
     , public beast::Thread
-    , public beast::LeakChecked <SNTPClientImp>
 {
 public:
     class SNTPQuery

src/ripple/nodestore/impl/DatabaseImp.h

@@ -39,7 +39,6 @@ namespace NodeStore {
 
 class DatabaseImp
     : public Database
-    , public beast::LeakChecked <DatabaseImp>
 {
 public:
     beast::Journal m_journal;

src/ripple/peerfinder/impl/Manager.cpp

@@ -33,7 +33,6 @@ namespace PeerFinder {
 
 class ManagerImp
     : public Manager
-    , public beast::LeakChecked <ManagerImp>
 {
 public:
     boost::asio::io_service &io_service_;

src/ripple/peerfinder/impl/StoreSqdb.h

@@ -29,7 +29,6 @@ namespace PeerFinder {
 /** Database persistence for PeerFinder using SQLite */
 class StoreSqdb
     : public Store
-    , public beast::LeakChecked <StoreSqdb>
 {
 private:
     beast::Journal m_journal;

src/ripple/protocol/impl/LedgerFormats.cpp

@@ -19,7 +19,6 @@
 
 #include <BeastConfig.h>
 #include <ripple/protocol/LedgerFormats.h>
-#include <beast/module/core/memory/SharedSingleton.h>
 
 namespace ripple {
 

src/ripple/server/impl/ServerHandlerImp.h

@@ -32,7 +32,6 @@ namespace ripple {
 // Private implementation
 class ServerHandlerImp
     : public ServerHandler
-    , public beast::LeakChecked <ServerHandlerImp>
     , public HTTP::Handler
 {
 private: