Boost/C++11 shared pointers.

12 files changed, 99 insertions, 99 deletions

diff --git a/src/security/cert/certificateChain.cpp b/src/security/cert/certificateChain.cpp
index ab12453e..3cb4e360 100644
--- a/src/security/cert/certificateChain.cpp
+++ b/src/security/cert/certificateChain.cpp
@@ -29,7 +29,7 @@ namespace security {
 namespace cert {
 
 
-certificateChain::certificateChain(const std::vector <ref <certificate> >& certs)
+certificateChain::certificateChain(const std::vector <shared_ptr <certificate> >& certs)
 	: m_certs(certs)
 {
 }
@@ -41,7 +41,7 @@ unsigned int certificateChain::getCount() const
 }
 
 
-ref <certificate> certificateChain::getAt(const unsigned int index)
+shared_ptr <certificate> certificateChain::getAt(const unsigned int index)
 {
 	return m_certs[index];
 }
diff --git a/src/security/cert/defaultCertificateVerifier.cpp b/src/security/cert/defaultCertificateVerifier.cpp
index bb185f36..1a95b353 100644
--- a/src/security/cert/defaultCertificateVerifier.cpp
+++ b/src/security/cert/defaultCertificateVerifier.cpp
@@ -55,7 +55,7 @@ defaultCertificateVerifier::defaultCertificateVerifier(const defaultCertificateV
 
 
 void defaultCertificateVerifier::verify
-	(ref <certificateChain> chain, const string& hostname)
+	(shared_ptr <certificateChain> chain, const string& hostname)
 {
 	if (chain->getCount() == 0)
 		return;
@@ -70,7 +70,7 @@ void defaultCertificateVerifier::verify
 
 
 void defaultCertificateVerifier::verifyX509
-	(ref <certificateChain> chain, const string& hostname)
+	(shared_ptr <certificateChain> chain, const string& hostname)
 {
 	// For every certificate in the chain, verify that the certificate
 	// has been issued by the next certificate in the chain
@@ -78,11 +78,11 @@ void defaultCertificateVerifier::verifyX509
 	{
 		for (unsigned int i = 0 ; i < chain->getCount() - 1 ; ++i)
 		{
-			ref <X509Certificate> cert =
-				chain->getAt(i).dynamicCast <X509Certificate>();
+			shared_ptr <X509Certificate> cert =
+				dynamicCast <X509Certificate>(chain->getAt(i));
 
-			ref <X509Certificate> next =
-				chain->getAt(i + 1).dynamicCast <X509Certificate>();
+			shared_ptr <X509Certificate> next =
+				dynamicCast <X509Certificate>(chain->getAt(i + 1));
 
 			if (!cert->checkIssuer(next))
 			{
@@ -98,8 +98,8 @@ void defaultCertificateVerifier::verifyX509
 
 	for (unsigned int i = 0 ; i < chain->getCount() ; ++i)
 	{
-		ref <X509Certificate> cert =
-			chain->getAt(i).dynamicCast <X509Certificate>();
+		shared_ptr <X509Certificate> cert =
+			dynamicCast <X509Certificate>(chain->getAt(i));
 
 		const datetime begin = cert->getActivationDate();
 		const datetime end = cert->getExpirationDate();
@@ -115,14 +115,14 @@ void defaultCertificateVerifier::verifyX509
 
 	// -- First, verify that the the last certificate in the chain was
 	// -- issued by a third-party that we trust
-	ref <X509Certificate> lastCert =
-		chain->getAt(chain->getCount() - 1).dynamicCast <X509Certificate>();
+	shared_ptr <X509Certificate> lastCert =
+		dynamicCast <X509Certificate>(chain->getAt(chain->getCount() - 1));
 
 	bool trusted = false;
 
 	for (unsigned int i = 0 ; !trusted && i < m_x509RootCAs.size() ; ++i)
 	{
-		ref <X509Certificate> rootCa = m_x509RootCAs[i];
+		shared_ptr <X509Certificate> rootCa = m_x509RootCAs[i];
 
 		if (lastCert->verify(rootCa))
 			trusted = true;
@@ -131,12 +131,12 @@ void defaultCertificateVerifier::verifyX509
 	// -- Next, if the issuer certificate cannot be verified against
 	// -- root CAs, compare the subject's certificate against the
 	// -- trusted certificates
-	ref <X509Certificate> firstCert =
-		chain->getAt(0).dynamicCast <X509Certificate>();
+	shared_ptr <X509Certificate> firstCert =
+		dynamicCast <X509Certificate>(chain->getAt(0));
 
 	for (unsigned int i = 0 ; !trusted && i < m_x509TrustedCerts.size() ; ++i)
 	{
-		ref <X509Certificate> cert = m_x509TrustedCerts[i];
+		shared_ptr <X509Certificate> cert = m_x509TrustedCerts[i];
 
 		if (firstCert->equals(cert))
 			trusted = true;
@@ -158,14 +158,14 @@ void defaultCertificateVerifier::verifyX509
 
 
 void defaultCertificateVerifier::setX509RootCAs
-	(const std::vector <ref <X509Certificate> >& caCerts)
+	(const std::vector <shared_ptr <X509Certificate> >& caCerts)
 {
 	m_x509RootCAs = caCerts;
 }
 
 
 void defaultCertificateVerifier::setX509TrustedCerts
-	(const std::vector <ref <X509Certificate> >& trustedCerts)
+	(const std::vector <shared_ptr <X509Certificate> >& trustedCerts)
 {
 	m_x509TrustedCerts = trustedCerts;
 }
diff --git a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
index 96137844..327ddefa 100644
--- a/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
+++ b/src/security/cert/gnutls/X509Certificate_GnuTLS.cpp
@@ -89,7 +89,7 @@ void* X509Certificate_GnuTLS::getInternalData()
 
 
 // static
-ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
+shared_ptr <X509Certificate> X509Certificate::import(utility::inputStream& is)
 {
 	byteArray bytes;
 	utility::stream::value_type chunk[4096];
@@ -105,7 +105,7 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 
 // static
-ref <X509Certificate> X509Certificate::import
+shared_ptr <X509Certificate> X509Certificate::import
 	(const byte_t* data, const size_t length)
 {
 	gnutls_datum buffer;
@@ -113,18 +113,18 @@ ref <X509Certificate> X509Certificate::import
 	buffer.size = static_cast <unsigned int>(length);
 
 	// Try DER format
-	ref <X509Certificate_GnuTLS> derCert = vmime::create <X509Certificate_GnuTLS>();
+	shared_ptr <X509Certificate_GnuTLS> derCert = make_shared <X509Certificate_GnuTLS>();
 
 	if (gnutls_x509_crt_import(derCert->m_data->cert, &buffer, GNUTLS_X509_FMT_DER) >= 0)
 		return derCert;
 
 	// Try PEM format
-	ref <X509Certificate_GnuTLS> pemCert = vmime::create <X509Certificate_GnuTLS>();
+	shared_ptr <X509Certificate_GnuTLS> pemCert = make_shared <X509Certificate_GnuTLS>();
 
 	if (gnutls_x509_crt_import(pemCert->m_data->cert, &buffer, GNUTLS_X509_FMT_PEM) >= 0)
 		return pemCert;
 
-	return NULL;
+	return null;
 }
 
 
@@ -161,20 +161,20 @@ const byteArray X509Certificate_GnuTLS::getSerialNumber() const
 }
 
 
-bool X509Certificate_GnuTLS::checkIssuer(ref <const X509Certificate> issuer_) const
+bool X509Certificate_GnuTLS::checkIssuer(shared_ptr <const X509Certificate> issuer_) const
 {
-	ref <const X509Certificate_GnuTLS> issuer =
-		issuer_.dynamicCast <const X509Certificate_GnuTLS>();
+	shared_ptr <const X509Certificate_GnuTLS> issuer =
+		dynamicCast <const X509Certificate_GnuTLS>(issuer_);
 
 	return (gnutls_x509_crt_check_issuer
 			(m_data->cert, issuer->m_data->cert) >= 1);
 }
 
 
-bool X509Certificate_GnuTLS::verify(ref <const X509Certificate> caCert_) const
+bool X509Certificate_GnuTLS::verify(shared_ptr <const X509Certificate> caCert_) const
 {
-	ref <const X509Certificate_GnuTLS> caCert =
-		caCert_.dynamicCast <const X509Certificate_GnuTLS>();
+	shared_ptr <const X509Certificate_GnuTLS> caCert =
+		dynamicCast <const X509Certificate_GnuTLS>(caCert_);
 
 	unsigned int verify = 0;
 
@@ -267,10 +267,10 @@ int X509Certificate_GnuTLS::getVersion() const
 }
 
 
-bool X509Certificate_GnuTLS::equals(ref <const certificate> other) const
+bool X509Certificate_GnuTLS::equals(shared_ptr <const certificate> other) const
 {
-	ref <const X509Certificate_GnuTLS> otherX509 =
-		other.dynamicCast <const X509Certificate_GnuTLS>();
+	shared_ptr <const X509Certificate_GnuTLS> otherX509 =
+		dynamicCast <const X509Certificate_GnuTLS>(other);
 
 	if (!otherX509)
 		return false;
diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
index 8c18583b..8c7174a0 100644
--- a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
+++ b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
@@ -158,17 +158,17 @@ void* X509Certificate_OpenSSL::getInternalData()
 
 
 // static
-ref <X509Certificate> X509Certificate_OpenSSL::importInternal(X509* cert)
+shared_ptr <X509Certificate> X509Certificate_OpenSSL::importInternal(X509* cert)
 {
 	if (cert)
-		return vmime::create <X509Certificate_OpenSSL>(reinterpret_cast <X509 *>(cert));
+		return make_shared <X509Certificate_OpenSSL>(reinterpret_cast <X509 *>(cert));
 
-	return NULL;
+	return null;
 }
 
 
 // static
-ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
+shared_ptr <X509Certificate> X509Certificate::import(utility::inputStream& is)
 {
 	byteArray bytes;
 	utility::stream::value_type chunk[4096];
@@ -184,17 +184,17 @@ ref <X509Certificate> X509Certificate::import(utility::inputStream& is)
 
 
 // static
-ref <X509Certificate> X509Certificate::import
+shared_ptr <X509Certificate> X509Certificate::import
 	(const byte_t* data, const size_t length)
 {
-	ref <X509Certificate_OpenSSL> cert = vmime::create <X509Certificate_OpenSSL>();
+	shared_ptr <X509Certificate_OpenSSL> cert = make_shared <X509Certificate_OpenSSL>();
 
 	BIO* membio = BIO_new_mem_buf(const_cast <byte_t*>(data), length);
 
 	if (!PEM_read_bio_X509(membio, &(cert->m_data->cert), 0, 0))
 	{
 		BIO_vfree(membio);
-		return NULL;
+		return null;
 	}
 
 	BIO_vfree(membio);
@@ -270,10 +270,10 @@ const byteArray X509Certificate_OpenSSL::getSerialNumber() const
 }
 
 
-bool X509Certificate_OpenSSL::checkIssuer(ref <const X509Certificate> cert_) const
+bool X509Certificate_OpenSSL::checkIssuer(shared_ptr <const X509Certificate> cert_) const
 {
-	ref <const X509Certificate_OpenSSL> cert =
-		cert_.dynamicCast <const X509Certificate_OpenSSL>();
+	shared_ptr <const X509Certificate_OpenSSL> cert =
+		dynamicCast <const X509Certificate_OpenSSL>(cert_);
 
 	// Get issuer for this cert
 	BIO *out;
@@ -297,10 +297,10 @@ bool X509Certificate_OpenSSL::checkIssuer(ref <const X509Certificate> cert_) con
 }
 
 
-bool X509Certificate_OpenSSL::verify(ref <const X509Certificate> caCert_) const
+bool X509Certificate_OpenSSL::verify(shared_ptr <const X509Certificate> caCert_) const
 {
-	ref <const X509Certificate_OpenSSL> caCert =
-		caCert_.dynamicCast <const X509Certificate_OpenSSL>();
+	shared_ptr <const X509Certificate_OpenSSL> caCert =
+		dynamicCast <const X509Certificate_OpenSSL>(caCert_);
 
 
 	bool verified = false;
@@ -550,10 +550,10 @@ int X509Certificate_OpenSSL::getVersion() const
 }
 
 
-bool X509Certificate_OpenSSL::equals(ref <const certificate> other) const
+bool X509Certificate_OpenSSL::equals(shared_ptr <const certificate> other) const
 {
-	ref <const X509Certificate_OpenSSL> otherX509 =
-		other.dynamicCast <const X509Certificate_OpenSSL>();
+	shared_ptr <const X509Certificate_OpenSSL> otherX509 =
+		dynamicCast <const X509Certificate_OpenSSL>(other);
 
 	if (!otherX509)
 		return false;
diff --git a/src/security/defaultAuthenticator.cpp b/src/security/defaultAuthenticator.cpp
index a2ff37f9..790196d2 100644
--- a/src/security/defaultAuthenticator.cpp
+++ b/src/security/defaultAuthenticator.cpp
@@ -50,7 +50,7 @@ defaultAuthenticator::~defaultAuthenticator()
 
 const string defaultAuthenticator::getUsername() const
 {
-	ref <const net::service> service = m_service.acquire();
+	shared_ptr <const net::service> service = m_service.lock();
 
 	const string prefix = service->getInfos().getPropertyPrefix();
 	const propertySet& props = service->getSession()->getProperties();
@@ -64,7 +64,7 @@ const string defaultAuthenticator::getUsername() const
 
 const string defaultAuthenticator::getPassword() const
 {
-	ref <const net::service> service = m_service.acquire();
+	shared_ptr <const net::service> service = m_service.lock();
 
 	const string prefix = service->getInfos().getPropertyPrefix();
 	const propertySet& props = service->getSession()->getProperties();
@@ -95,13 +95,13 @@ const string defaultAuthenticator::getServiceName() const
 }
 
 
-void defaultAuthenticator::setService(ref <net::service> serv)
+void defaultAuthenticator::setService(shared_ptr <net::service> serv)
 {
 	m_service = serv;
 }
 
 
-weak_ref <net::service> defaultAuthenticator::getService() const
+weak_ptr <net::service> defaultAuthenticator::getService() const
 {
 	return m_service;
 }
diff --git a/src/security/digest/messageDigestFactory.cpp b/src/security/digest/messageDigestFactory.cpp
index 6d424155..2831c5a1 100644
--- a/src/security/digest/messageDigestFactory.cpp
+++ b/src/security/digest/messageDigestFactory.cpp
@@ -52,7 +52,7 @@ messageDigestFactory* messageDigestFactory::getInstance()
 }
 
 
-ref <messageDigest> messageDigestFactory::create(const string& name)
+shared_ptr <messageDigest> messageDigestFactory::create(const string& name)
 {
 	const MapType::const_iterator it = m_algos.find
 		(utility::stringUtils::toLower(name));
diff --git a/src/security/sasl/SASLContext.cpp b/src/security/sasl/SASLContext.cpp
index 7b24f1e3..c4d60bd9 100644
--- a/src/security/sasl/SASLContext.cpp
+++ b/src/security/sasl/SASLContext.cpp
@@ -62,27 +62,27 @@ SASLContext::~SASLContext()
 }
 
 
-ref <SASLSession> SASLContext::createSession
+shared_ptr <SASLSession> SASLContext::createSession
 	(const string& serviceName,
-	 ref <authenticator> auth, ref <SASLMechanism> mech)
+	 shared_ptr <authenticator> auth, shared_ptr <SASLMechanism> mech)
 {
-	return vmime::create <SASLSession>
-		(serviceName, thisRef().dynamicCast <SASLContext>(), auth, mech);
+	return make_shared <SASLSession>
+		(serviceName, dynamicCast <SASLContext>(shared_from_this()), auth, mech);
 }
 
 
-ref <SASLMechanism> SASLContext::createMechanism(const string& name)
+shared_ptr <SASLMechanism> SASLContext::createMechanism(const string& name)
 {
 	return SASLMechanismFactory::getInstance()->create
-		(thisRef().dynamicCast <SASLContext>(), name);
+		(dynamicCast <SASLContext>(shared_from_this()), name);
 }
 
 
-ref <SASLMechanism> SASLContext::suggestMechanism
-	(const std::vector <ref <SASLMechanism> >& mechs)
+shared_ptr <SASLMechanism> SASLContext::suggestMechanism
+	(const std::vector <shared_ptr <SASLMechanism> >& mechs)
 {
 	if (mechs.empty())
-		return 0;
+		return null;
 
 	std::ostringstream oss;
 
@@ -102,7 +102,7 @@ ref <SASLMechanism> SASLContext::suggestMechanism
 		}
 	}
 
-	return 0;
+	return null;
 }
 
 
@@ -113,7 +113,7 @@ void SASLContext::decodeB64(const string& input, byte_t** output, long* outputLe
 	utility::inputStreamStringAdapter is(input);
 	utility::outputStreamStringAdapter os(res);
 
-	ref <utility::encoder::encoder> dec =
+	shared_ptr <utility::encoder::encoder> dec =
 		utility::encoder::encoderFactory::getInstance()->create("base64");
 
 	dec->decode(is, os);
@@ -134,7 +134,7 @@ const string SASLContext::encodeB64(const byte_t* input, const long inputLen)
 	utility::inputStreamByteBufferAdapter is(input, inputLen);
 	utility::outputStreamStringAdapter os(res);
 
-	ref <utility::encoder::encoder> enc =
+	shared_ptr <utility::encoder::encoder> enc =
 		utility::encoder::encoderFactory::getInstance()->create("base64");
 
 	enc->encode(is, os);
diff --git a/src/security/sasl/SASLMechanismFactory.cpp b/src/security/sasl/SASLMechanismFactory.cpp
index 0f2dd3af..255a13f1 100644
--- a/src/security/sasl/SASLMechanismFactory.cpp
+++ b/src/security/sasl/SASLMechanismFactory.cpp
@@ -68,15 +68,15 @@ SASLMechanismFactory* SASLMechanismFactory::getInstance()
 }
 
 
-ref <SASLMechanism> SASLMechanismFactory::create
-	(ref <SASLContext> ctx, const string& name_)
+shared_ptr <SASLMechanism> SASLMechanismFactory::create
+	(shared_ptr <SASLContext> ctx, const string& name_)
 {
 	const string name(utility::stringUtils::toUpper(name_));
 
 	// Check for built-in mechanisms
 	if (isMechanismSupported(name))
 	{
-		return vmime::create <builtinSASLMechanism>(ctx, name);
+		return make_shared <builtinSASLMechanism>(ctx, name);
 	}
 	// Check for registered mechanisms
 	else
@@ -88,7 +88,7 @@ ref <SASLMechanism> SASLMechanismFactory::create
 	}
 
 	throw exceptions::no_such_mechanism(name);
-	return 0;
+	return null;
 }
 
 
diff --git a/src/security/sasl/SASLSession.cpp b/src/security/sasl/SASLSession.cpp
index c34bdd7f..1bdd0889 100644
--- a/src/security/sasl/SASLSession.cpp
+++ b/src/security/sasl/SASLSession.cpp
@@ -43,8 +43,8 @@ namespace security {
 namespace sasl {
 
 
-SASLSession::SASLSession(const string& serviceName, ref <SASLContext> ctx,
-                 ref <authenticator> auth, ref <SASLMechanism> mech)
+SASLSession::SASLSession(const string& serviceName, shared_ptr <SASLContext> ctx,
+                 shared_ptr <authenticator> auth, shared_ptr <SASLMechanism> mech)
 	: m_serviceName(serviceName), m_context(ctx), m_auth(auth),
 	  m_mech(mech), m_gsaslContext(0), m_gsaslSession(0)
 {
@@ -61,38 +61,38 @@ SASLSession::SASLSession(const string& serviceName, ref <SASLContext> ctx,
 SASLSession::~SASLSession()
 {
 	gsasl_finish(m_gsaslSession);
-	m_gsaslSession = 0;
+	m_gsaslSession = NULL;
 
 	gsasl_done(m_gsaslContext);
-	m_gsaslContext = 0;
+	m_gsaslContext = NULL;
 }
 
 
 void SASLSession::init()
 {
-	ref <SASLAuthenticator> saslAuth = m_auth.dynamicCast <SASLAuthenticator>();
+	shared_ptr <SASLAuthenticator> saslAuth = dynamicCast <SASLAuthenticator>(m_auth);
 
 	if (saslAuth)
 	{
 		saslAuth->setSASLMechanism(m_mech);
-		saslAuth->setSASLSession(thisRef().dynamicCast <SASLSession>());
+		saslAuth->setSASLSession(dynamicCast <SASLSession>(shared_from_this()));
 	}
 }
 
 
-ref <authenticator> SASLSession::getAuthenticator()
+shared_ptr <authenticator> SASLSession::getAuthenticator()
 {
 	return m_auth;
 }
 
 
-ref <SASLMechanism> SASLSession::getMechanism()
+shared_ptr <SASLMechanism> SASLSession::getMechanism()
 {
 	return m_mech;
 }
 
 
-ref <SASLContext> SASLSession::getContext()
+shared_ptr <SASLContext> SASLSession::getContext()
 {
 	return m_context;
 }
@@ -102,14 +102,14 @@ bool SASLSession::evaluateChallenge
 	(const byte_t* challenge, const long challengeLen,
 	 byte_t** response, long* responseLen)
 {
-	return m_mech->step(thisRef().dynamicCast <SASLSession>(),
+	return m_mech->step(dynamicCast <SASLSession>(shared_from_this()),
 		challenge, challengeLen, response, responseLen);
 }
 
 
-ref <net::socket> SASLSession::getSecuredSocket(ref <net::socket> sok)
+shared_ptr <net::socket> SASLSession::getSecuredSocket(shared_ptr <net::socket> sok)
 {
-	return vmime::create <SASLSocket>(thisRef().dynamicCast <SASLSession>(), sok);
+	return make_shared <SASLSocket>(dynamicCast <SASLSession>(shared_from_this()), sok);
 }
 
 
@@ -126,7 +126,7 @@ int SASLSession::gsaslCallback
 	SASLSession* sess = reinterpret_cast <SASLSession*>(gsasl_callback_hook_get(ctx));
 	if (!sess) return GSASL_AUTHENTICATION_ERROR;
 
-	ref <authenticator> auth = sess->getAuthenticator();
+	shared_ptr <authenticator> auth = sess->getAuthenticator();
 
 	try
 	{
diff --git a/src/security/sasl/SASLSocket.cpp b/src/security/sasl/SASLSocket.cpp
index b6b1d272..37e297dc 100644
--- a/src/security/sasl/SASLSocket.cpp
+++ b/src/security/sasl/SASLSocket.cpp
@@ -43,7 +43,7 @@ namespace sasl {
 
 
 
-SASLSocket::SASLSocket(ref <SASLSession> sess, ref <net::socket> wrapped)
+SASLSocket::SASLSocket(shared_ptr <SASLSession> sess, shared_ptr <net::socket> wrapped)
 	: m_session(sess), m_wrapped(wrapped),
 	  m_pendingBuffer(0), m_pendingPos(0), m_pendingLen(0)
 {
diff --git a/src/security/sasl/builtinSASLMechanism.cpp b/src/security/sasl/builtinSASLMechanism.cpp
index 86b429bf..e7bd723e 100644
--- a/src/security/sasl/builtinSASLMechanism.cpp
+++ b/src/security/sasl/builtinSASLMechanism.cpp
@@ -45,7 +45,7 @@ namespace security {
 namespace sasl {
 
 
-builtinSASLMechanism::builtinSASLMechanism(ref <SASLContext> ctx, const string& name)
+builtinSASLMechanism::builtinSASLMechanism(shared_ptr <SASLContext> ctx, const string& name)
 	: m_context(ctx), m_name(name), m_complete(false)
 {
 }
@@ -63,7 +63,7 @@ const string builtinSASLMechanism::getName() const
 
 
 bool builtinSASLMechanism::step
-	(ref <SASLSession> sess, const byte_t* challenge, const long challengeLen,
+	(shared_ptr <SASLSession> sess, const byte_t* challenge, const long challengeLen,
 	 byte_t** response, long* responseLen)
 {
 	char* output = 0;
@@ -121,7 +121,7 @@ bool builtinSASLMechanism::isComplete() const
 
 
 void builtinSASLMechanism::encode
-	(ref <SASLSession> sess, const byte_t* input, const long inputLen,
+	(shared_ptr <SASLSession> sess, const byte_t* input, const long inputLen,
 	 byte_t** output, long* outputLen)
 {
 	char* coutput = 0;
@@ -154,7 +154,7 @@ void builtinSASLMechanism::encode
 
 
 void builtinSASLMechanism::decode
-	(ref <SASLSession> sess, const byte_t* input, const long inputLen,
+	(shared_ptr <SASLSession> sess, const byte_t* input, const long inputLen,
 	 byte_t** output, long* outputLen)
 {
 	char* coutput = 0;
diff --git a/src/security/sasl/defaultSASLAuthenticator.cpp b/src/security/sasl/defaultSASLAuthenticator.cpp
index bb72e56f..7fe9b3eb 100644
--- a/src/security/sasl/defaultSASLAuthenticator.cpp
+++ b/src/security/sasl/defaultSASLAuthenticator.cpp
@@ -51,14 +51,14 @@ defaultSASLAuthenticator::~defaultSASLAuthenticator()
 }
 
 
-const std::vector <ref <SASLMechanism> >
+const std::vector <shared_ptr <SASLMechanism> >
 	defaultSASLAuthenticator::getAcceptableMechanisms
-		(const std::vector <ref <SASLMechanism> >& available,
-		 ref <SASLMechanism> suggested) const
+		(const std::vector <shared_ptr <SASLMechanism> >& available,
+		 shared_ptr <SASLMechanism> suggested) const
 {
 	if (suggested)
 	{
-		std::vector <ref <SASLMechanism> > res;
+		std::vector <shared_ptr <SASLMechanism> > res;
 
 		res.push_back(suggested);
 
@@ -103,42 +103,42 @@ const string defaultSASLAuthenticator::getAnonymousToken() const
 
 const string defaultSASLAuthenticator::getServiceName() const
 {
-	return m_saslSession.acquire()->getServiceName();
+	return m_saslSession.lock()->getServiceName();
 }
 
 
-void defaultSASLAuthenticator::setService(ref <net::service> serv)
+void defaultSASLAuthenticator::setService(shared_ptr <net::service> serv)
 {
 	m_service = serv;
 	m_default.setService(serv);
 }
 
 
-weak_ref <net::service> defaultSASLAuthenticator::getService() const
+weak_ptr <net::service> defaultSASLAuthenticator::getService() const
 {
 	return m_service;
 }
 
 
-void defaultSASLAuthenticator::setSASLSession(ref <SASLSession> sess)
+void defaultSASLAuthenticator::setSASLSession(shared_ptr <SASLSession> sess)
 {
 	m_saslSession = sess;
 }
 
 
-ref <SASLSession> defaultSASLAuthenticator::getSASLSession() const
+shared_ptr <SASLSession> defaultSASLAuthenticator::getSASLSession() const
 {
-	return m_saslSession.acquire().constCast <SASLSession>();
+	return constCast <SASLSession>(m_saslSession.lock());
 }
 
 
-void defaultSASLAuthenticator::setSASLMechanism(ref <SASLMechanism> mech)
+void defaultSASLAuthenticator::setSASLMechanism(shared_ptr <SASLMechanism> mech)
 {
 	m_saslMech = mech;
 }
 
 
-ref <SASLMechanism> defaultSASLAuthenticator::getSASLMechanism() const
+shared_ptr <SASLMechanism> defaultSASLAuthenticator::getSASLMechanism() const
 {
 	return m_saslMech;
 }