2 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/Component/ComponentSession.cpp b/Swiften/Component/ComponentSession.cpp
index af11146..51d9d15 100644
--- a/Swiften/Component/ComponentSession.cpp
+++ b/Swiften/Component/ComponentSession.cpp
@@ -1,18 +1,19 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Component/ComponentSession.h>
 
 #include <boost/bind.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Elements/ProtocolHeader.h>
 #include <Swiften/Elements/ComponentHandshake.h>
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/Component/ComponentHandshakeGenerator.h>
 
 namespace Swift {
 
 ComponentSession::ComponentSession(const JID& jid, const std::string& secret, boost::shared_ptr<SessionStream> stream) : jid(jid), secret(secret), stream(stream), state(Initial) {
@@ -95,19 +96,19 @@ void ComponentSession::handleStreamClosed(boost::shared_ptr<Swift::Error> stream
 		onFinished(streamError);
 	}
 }
 
 void ComponentSession::finish() {
 	finishSession(boost::shared_ptr<Error>());
 }
 
 void ComponentSession::finishSession(Error::Type error) {
-	finishSession(boost::shared_ptr<Swift::ComponentSession::Error>(new Swift::ComponentSession::Error(error)));
+	finishSession(boost::make_shared<Swift::ComponentSession::Error>(error));
 }
 
 void ComponentSession::finishSession(boost::shared_ptr<Swift::Error> finishError) {
 	state = Finishing;
 	error = finishError;
 	assert(stream->isOpen());
 	stream->writeFooter();
 	stream->close();
 }
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index 1541cce..9763c7f 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -20,19 +20,19 @@ using namespace Swift;
 class ComponentSessionTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(ComponentSessionTest);
 		CPPUNIT_TEST(testStart);
 		CPPUNIT_TEST(testStart_Error);
 		CPPUNIT_TEST(testStart_Unauthorized);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
-			server = boost::shared_ptr<MockSessionStream>(new MockSessionStream());
+			server = boost::make_shared<MockSessionStream>();
 			sessionFinishedReceived = false;
 		}
 
 		void testStart() {
 			boost::shared_ptr<ComponentSession> session(createSession());
 			session->start();
 			server->receiveStreamStart();
 			server->sendStreamStart();
 			server->receiveHandshake();
@@ -153,19 +153,19 @@ class ComponentSessionTest : public CppUnit::TestFixture {
 				virtual void setWhitespacePingEnabled(bool enabled) {
 					whitespacePingEnabled = enabled;
 				}
 
 				virtual void resetXMPPParser() {
 					resetCount++;
 				}
 
 				void breakConnection() {
-					onClosed(boost::shared_ptr<SessionStream::Error>(new SessionStream::Error(SessionStream::Error::ConnectionReadError)));
+					onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::ConnectionReadError));
 				}
 
 				void sendStreamStart() {
 					ProtocolHeader header;
 					header.setFrom("service.foo.com");
 					return onStreamStartReceived(header);
 				}
 
 				void sendHandshakeResponse() {