Skip to content

Commit 0031d3a

Browse files
committed
Migrate to unique_ptr from raw pointer
1 parent 0a3731c commit 0031d3a

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/internal/sio_client_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ namespace sio
615615
typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
616616
static context_ptr on_tls_init(connection_hdl conn)
617617
{
618-
context_ptr ctx = context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
618+
context_ptr ctx = context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
619619
boost::system::error_code ec;
620620
ctx->set_options(boost::asio::ssl::context::default_workarounds |
621621
boost::asio::ssl::context::no_sslv2 |

src/sio_client.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,18 @@ namespace sio
2222
{
2323
if(!client_impl_base::is_tls(uri))
2424
{
25-
m_impl = new client_impl<client_type_no_tls>(uri);
25+
m_impl = std::unique_ptr<client_impl<client_type_no_tls>>(new client_impl<client_type_no_tls>(uri));
2626
}
2727
#if SIO_TLS
2828
else
2929
{
30-
m_impl = new client_impl<client_type_tls>(uri);
30+
m_impl = std::unique_ptr<client_impl<client_type_tls>>(new client_impl<client_type_tls>(uri));
3131
}
3232
#endif
3333
}
3434

3535
client::~client()
3636
{
37-
delete m_impl;
3837
}
3938

4039
void client::set_open_listener(con_listener const& l)
@@ -84,17 +83,17 @@ namespace sio
8483

8584
void client::connect()
8685
{
87-
m_impl->connect(std::string(), {}, {});
86+
this->connect(std::string(), {}, {});
8887
}
8988

9089
void client::connect(const std::string& uri)
9190
{
92-
m_impl->connect(uri, {}, {});
91+
this->connect(uri, {}, {});
9392
}
9493

9594
void client::connect(const std::string& uri, const std::map<string,string>& query)
9695
{
97-
m_impl->connect(uri, query, {});
96+
this->connect(uri, query, {});
9897
}
9998

10099
void client::connect(const std::string& uri, const std::map<std::string,std::string>& query,

src/sio_client.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#ifndef SIO_CLIENT_H
88
#define SIO_CLIENT_H
99
#include <string>
10+
#include <memory>
1011
#include <functional>
1112
#include "sio_message.h"
1213
#include "sio_socket.h"
@@ -96,7 +97,7 @@ namespace sio
9697
client(client const&){}
9798
void operator=(client const&){}
9899

99-
client_impl_base* m_impl;
100+
std::unique_ptr<client_impl_base> m_impl;
100101
};
101102

102103
}

0 commit comments

Comments
 (0)