Remove deprecated createOnDemandOnce SingletonLifetime option

This commit is contained in:
Vinnie Falco
2013-09-12 00:43:05 -07:00
parent 8c522aa758
commit 6eda7772eb

View File

@@ -93,12 +93,6 @@ protected:
{ {
incReferenceCount (); incReferenceCount ();
} }
else if (m_lifetime == createOnDemandOnce && *s_created)
{
Throw (Error ().fail (__FILE__, __LINE__));
}
*s_created = true;
} }
virtual ~SharedSingleton () virtual ~SharedSingleton ()
@@ -194,7 +188,6 @@ private:
private: private:
static Object* s_instance; static Object* s_instance;
static Static::Storage <LockType, SharedSingleton <Object> > s_mutex; static Static::Storage <LockType, SharedSingleton <Object> > s_mutex;
static Static::Storage <bool, SharedSingleton <Object> > s_created;
}; };
/** @{ */ /** @{ */
@@ -205,8 +198,4 @@ template <class Object>
Static::Storage <typename SharedSingleton <Object>::LockType, SharedSingleton <Object> > Static::Storage <typename SharedSingleton <Object>::LockType, SharedSingleton <Object> >
SharedSingleton <Object>::s_mutex; SharedSingleton <Object>::s_mutex;
template <class Object>
Static::Storage <bool, SharedSingleton <Object> >
SharedSingleton <Object>::s_created;
#endif #endif