enh: #3890: Get rid of SingletonHolder

This commit is contained in:
Günter Obiltschnig
2024-01-30 09:56:27 +01:00
parent 33638df51e
commit d5a5ebc2d7
23 changed files with 44 additions and 168 deletions

View File

@@ -22,7 +22,6 @@
#include "Poco/Net/Utility.h"
#include "Poco/Net/PrivateKeyPassphraseHandler.h"
#include "Poco/Net/RejectCertificateHandler.h"
#include "Poco/SingletonHolder.h"
#include "Poco/Delegate.h"
#include "Poco/Util/Application.h"
#include "Poco/Util/OptionException.h"
@@ -81,15 +80,10 @@ SSLManager::~SSLManager()
}
namespace
{
static Poco::SingletonHolder<SSLManager> singleton;
}
SSLManager& SSLManager::instance()
{
return *singleton.get();
static SSLManager sm;
return sm;
}

View File

@@ -1569,15 +1569,10 @@ void SecureSocketImpl::stateMachine()
}
namespace
{
static Poco::SingletonHolder<StateMachine> stateMachineSingleton;
}
StateMachine& StateMachine::instance()
{
return *stateMachineSingleton.get();
static StateMachine sm;
return sm;
}