atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correction of the singleton system

Browse Source
This commit is contained in:
Edouard Dupin 2012-02-02 18:20:40 +01:00
parent ff3e92fd01
commit a4c8558ab7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Sources/libetk/etk/Singleton.h
View File

@ -31,11 +31,11 @@ namespace etk {
{ {
protected: protected:
// Constructeur/destructeur // Constructeur/destructeur
Singleton() { } Singleton(void) { }
~Singleton() { /*std::cout << "destroying singleton." << std::endl;*/ } ~Singleton(void) { /*std::cout << "destroying singleton." << std::endl;*/ }
public: public:
// Interface publique // Interface publique
static T *Get() static T *Get(void)
{ {
if (NULL == _singleton) if (NULL == _singleton)
{ {
@ -43,7 +43,7 @@ namespace etk {
} }
return (static_cast<T*> (_singleton)); return (static_cast<T*> (_singleton));
} }
static T *getInstance() static T *getInstance(void)
{ {
if (NULL == _singleton) if (NULL == _singleton)
{ {
@ -51,7 +51,7 @@ namespace etk {
} }
return (static_cast<T*> (_singleton)); return (static_cast<T*> (_singleton));
} }
static void Kill() static void Kill(void)
{ {
if (NULL != _singleton) if (NULL != _singleton)
{ {

2
Sources/libewol/ewol/base/MainThread.cpp
View File

@ -96,9 +96,9 @@ static void* BaseAppEntry(void* param)
EWOL_INFO("v" EWOL_VERSION_TAG_NAME); EWOL_INFO("v" EWOL_VERSION_TAG_NAME);
EWOL_INFO("Build Date: " VERSION_BUILD_TIME); EWOL_INFO("Build Date: " VERSION_BUILD_TIME);
ewol::widgetManager::Init();
ewol::texture::Init(); ewol::texture::Init();
ewol::theme::Init(); ewol::theme::Init();
ewol::widgetManager::Init();
ewol::InitFont(); ewol::InitFont();
APP_Init(); APP_Init();
int32_t countNbEvent = 0; int32_t countNbEvent = 0;