Fix merge error

parent e5004d13
...@@ -1375,7 +1375,7 @@ Sessions& GetSessions() ...@@ -1375,7 +1375,7 @@ Sessions& GetSessions()
static sslFactory* sslFactoryInstance = 0; static sslFactory* sslFactoryInstance = 0;
sslFactory& GetSSL_Factory() sslFactory& GetSSL_Factory(){
if (!sslFactoryInstance) if (!sslFactoryInstance)
sslFactoryInstance = NEW_YS sslFactory; sslFactoryInstance = NEW_YS sslFactory;
return *sslFactoryInstance; return *sslFactoryInstance;
......
...@@ -2738,14 +2738,6 @@ void CleanUp() ...@@ -2738,14 +2738,6 @@ void CleanUp()
} }
// Clean up static singleton holders, not a leak, but helpful to have gone
// when checking for leaks
void CleanUp()
{
tcDelete(one);
tcDelete(zero);
}
Integer::Integer(RandomNumberGenerator& rng, const Integer& min, Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
const Integer& max) const Integer& max)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment