Attachment #317704 for bug #425508

View | Details | Raw Unified | Return to bug 425508
Collapse All | Expand All




#include "CaelumPrecompiled.h"
#include "CaelumPlugin.h"

template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;

namespace Caelum
{
	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
        return msSingleton;
    }

    CaelumPlugin& CaelumPlugin::getSingleton () {  
        assert (msSingleton);
        return *msSingleton;
    }

    extern "C" void CAELUM_EXPORT dllStartPlugin () {

Return to bug 425508

Lines 21-37 Link Here

(-)main/src/CaelumPlugin.cpp.old (-4 / +4 lines)
21	#include "CaelumPrecompiled.h"	21	#include "CaelumPrecompiled.h"
22	#include "CaelumPlugin.h"	22	#include "CaelumPlugin.h"
23		23
24	template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;	24	template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;
25		25
26	namespace Caelum	26	namespace Caelum
27	{	27	{
28	CaelumPlugin* CaelumPlugin::getSingletonPtr () {	28	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
29	return ms_Singleton;	29	return msSingleton;
30	}	30	}
31		31
32	CaelumPlugin& CaelumPlugin::getSingleton () {	32	CaelumPlugin& CaelumPlugin::getSingleton () {
33	assert (ms_Singleton);	33	assert (msSingleton);
34	return *ms_Singleton;	34	return *msSingleton;
35	}	35	}
36		36
37	extern "C" void CAELUM_EXPORT dllStartPlugin () {	37	extern "C" void CAELUM_EXPORT dllStartPlugin () {