generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-06 00:31:10 +01:00
Code Issues Projects Releases Wiki Activity

factor out Var destruction

Browse Source
This commit is contained in:
aleks-f 2013-02-17 17:05:36 -06:00
parent 9378680c0b
commit f78a4e8965
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Foundation/include/Poco/Dynamic/Var.h
View File

@ -572,6 +572,11 @@ private:
return _pHolder; return _pHolder;
} }
void destruct()
{
if(!isEmpty()) delete content();
}
VarHolder* _pHolder; VarHolder* _pHolder;
#else #else
@ -619,6 +624,17 @@ private:
_placeholder.erase(); _placeholder.erase();
} }
void destruct()
{
if(!isEmpty())
{
if(_placeholder.isLocal())
content()->~VarHolder();
else
delete content();
}
}
Placeholder<VarHolder> _placeholder; Placeholder<VarHolder> _placeholder;
#endif // POCO_NO_SOO #endif // POCO_NO_SOO
@ -652,7 +668,7 @@ inline void Var::swap(Var& other)
else else
{ {
Var tmp(*this); Var tmp(*this);
if (_placeholder.isLocal()) this->~Var(); if (_placeholder.isLocal()) destruct();
construct(other); construct(other);
other = tmp; other = tmp;
} }

10
Foundation/src/Var.cpp
View File

@ -79,15 +79,7 @@ Var::Var(const Var& other)
Var::~Var() Var::~Var()
{ {
if(!isEmpty()) destruct();
{
#ifndef POCO_NO_SOO
if(_placeholder.isLocal())
content()->~VarHolder();
else
#endif
delete content();
}
} }