mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-28 08:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(Singleton): delete properly instance at program termination

Browse source
This commit is contained in:
Ronan Abhamon 2017-08-09 09:25:52 +02:00
parent 3c446b7695
commit a396e8919a
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpim/header/cpim-generic-header.cpp
View file

@ -32,8 +32,8 @@ using namespace LinphonePrivate;
class Cpim::GenericHeaderPrivate : public HeaderPrivate {
public:
GenericHeaderPrivate() : parameters(make_shared< list< pair<string, string> > >()){
}
GenericHeaderPrivate () : parameters(make_shared<list<pair<string, string> > >()) {}
string name;
shared_ptr<list<pair<string, string> > > parameters;
};

10
src/object/singleton.h
View file

@ -30,8 +30,10 @@ namespace LinphonePrivate {
virtual ~Singleton () = default;
static T *getInstance () {
if (!mInstance)
if (!mInstance) {
mInstance = new T();
static SingletonDeleter deleter;
}
return mInstance;
}
@ -39,6 +41,12 @@ namespace LinphonePrivate {
explicit Singleton (ObjectPrivate &p) : Object(p) {}
private:
struct SingletonDeleter {
~SingletonDeleter () {
delete mInstance;
}
};
static T *mInstance;
L_DISABLE_COPY(Singleton);