From 6eda7772eb5a8151a9cd90e6bf9ecd8fd0a539b2 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 12 Sep 2013 00:43:05 -0700 Subject: [PATCH] Remove deprecated createOnDemandOnce SingletonLifetime option --- modules/beast_core/memory/beast_SharedSingleton.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modules/beast_core/memory/beast_SharedSingleton.h b/modules/beast_core/memory/beast_SharedSingleton.h index 093976a75..8e8b14611 100644 --- a/modules/beast_core/memory/beast_SharedSingleton.h +++ b/modules/beast_core/memory/beast_SharedSingleton.h @@ -93,12 +93,6 @@ protected: { incReferenceCount (); } - else if (m_lifetime == createOnDemandOnce && *s_created) - { - Throw (Error ().fail (__FILE__, __LINE__)); - } - - *s_created = true; } virtual ~SharedSingleton () @@ -194,7 +188,6 @@ private: private: static Object* s_instance; static Static::Storage > s_mutex; - static Static::Storage > s_created; }; /** @{ */ @@ -205,8 +198,4 @@ template Static::Storage ::LockType, SharedSingleton > SharedSingleton ::s_mutex; -template -Static::Storage > -SharedSingleton ::s_created; - #endif