benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problem with static initialisation order

Browse source
This commit is contained in:
Fischlurch 2008-02-02 14:52:23 +01:00
parent edbf5fd733
commit 0d50639d70
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/singletonsubclass.hpp
View file

@ -73,13 +73,20 @@ namespace cinelerra
virtual S* create () { return POL<S>::create (); } // covariance checked!
virtual void destroy (I* pSi) { POL<S>::destroy (static_cast<S*> (pSi)); }
};
struct My_scoped_ptr : scoped_ptr<Link> ///< implementation detail: defeat static initialisation
{
using scoped_ptr<Link>::get;
My_scoped_ptr() : scoped_ptr<Link> (get()? get() : 0) {} ///< bypass if already configured
};
/** we configure this link \i later, when the singleton factory
* is actually created, to point at the desired implementation subclass.
*/
static scoped_ptr<Link> link;
static My_scoped_ptr link;
/** Forwarding Template to configure the basic SingletonFactory */
/** Forwarding Template used to configure the basic SingletonFactory */
template<class II>
struct Adapted
{
@ -89,7 +96,7 @@ namespace cinelerra
};
template<template<class> class A, class I>
scoped_ptr<typename Adapter<A,I>::Link> Adapter<A,I>::link (0);
typename Adapter<A,I>::My_scoped_ptr Adapter<A,I>::link; // note: use special ctor (due to stati init order!)
/** type-information used to configure the factory instance