atria-soft/enet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update new ememory::SharedPtr

Browse Source
This commit is contained in:
Edouard DUPIN 2016-07-15 21:22:11 +02:00
parent 31bf196278
commit e9a67be7ae
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
enet/WebSocket.cpp
View File

@ -42,13 +42,13 @@ enet::WebSocket::WebSocket(enet::Tcp _connection, bool _isServer) :
m_observerUriCheck(nullptr) { m_observerUriCheck(nullptr) {
_connection.setTCPNoDelay(true); _connection.setTCPNoDelay(true);
if (_isServer == true) { if (_isServer == true) {
ememory::SharedPtr<enet::HttpServer> interface = std::make_shared<enet::HttpServer>(std::move(_connection)); ememory::SharedPtr<enet::HttpServer> interface = ememory::makeShared<enet::HttpServer>(std::move(_connection));
m_interface = interface; m_interface = interface;
if (interface != nullptr) { if (interface != nullptr) {
interface->connectHeader(this, &enet::WebSocket::onReceiveRequest); interface->connectHeader(this, &enet::WebSocket::onReceiveRequest);
} }
} else { } else {
ememory::SharedPtr<enet::HttpClient> interface = std::make_shared<enet::HttpClient>(std::move(_connection)); ememory::SharedPtr<enet::HttpClient> interface = ememory::makeShared<enet::HttpClient>(std::move(_connection));
m_interface = interface; m_interface = interface;
if (interface != nullptr) { if (interface != nullptr) {
interface->connectHeader(this, &enet::WebSocket::onReceiveAnswer); interface->connectHeader(this, &enet::WebSocket::onReceiveAnswer);
@ -64,13 +64,13 @@ enet::WebSocket::WebSocket(enet::Tcp _connection, bool _isServer) :
void enet::WebSocket::setInterface(enet::Tcp _connection, bool _isServer) { void enet::WebSocket::setInterface(enet::Tcp _connection, bool _isServer) {
_connection.setTCPNoDelay(true); _connection.setTCPNoDelay(true);
if (_isServer == true) { if (_isServer == true) {
ememory::SharedPtr<enet::HttpServer> interface = std::make_shared<enet::HttpServer>(std::move(_connection)); ememory::SharedPtr<enet::HttpServer> interface = ememory::makeShared<enet::HttpServer>(std::move(_connection));
m_interface = interface; m_interface = interface;
if (interface != nullptr) { if (interface != nullptr) {
interface->connectHeader(this, &enet::WebSocket::onReceiveRequest); interface->connectHeader(this, &enet::WebSocket::onReceiveRequest);
} }
} else { } else {
ememory::SharedPtr<enet::HttpClient> interface = std::make_shared<enet::HttpClient>(std::move(_connection)); ememory::SharedPtr<enet::HttpClient> interface = ememory::makeShared<enet::HttpClient>(std::move(_connection));
m_interface = interface; m_interface = interface;
if (interface != nullptr) { if (interface != nullptr) {
interface->connectHeader(this, &enet::WebSocket::onReceiveAnswer); interface->connectHeader(this, &enet::WebSocket::onReceiveAnswer);
@ -139,7 +139,7 @@ void enet::WebSocket::start(const std::string& _uri, const std::vector<std::stri
if (protocolList != "") { if (protocolList != "") {
req.setKey("Sec-WebSocket-Protocol", protocolList); req.setKey("Sec-WebSocket-Protocol", protocolList);
} }
ememory::SharedPtr<enet::HttpClient> interface = std::dynamic_pointer_cast<enet::HttpClient>(m_interface); ememory::SharedPtr<enet::HttpClient> interface = ememory::dynamicPointerCast<enet::HttpClient>(m_interface);
if (interface != nullptr) { if (interface != nullptr) {
interface->setHeader(req); interface->setHeader(req);
int32_t timeout = 500000; // 5 second int32_t timeout = 500000; // 5 second
@ -336,7 +336,7 @@ static std::string removeStartAndStopSpace(const std::string& _value) {
} }
void enet::WebSocket::onReceiveRequest(const enet::HttpRequest& _data) { void enet::WebSocket::onReceiveRequest(const enet::HttpRequest& _data) {
ememory::SharedPtr<enet::HttpServer> interface = std::dynamic_pointer_cast<enet::HttpServer>(m_interface); ememory::SharedPtr<enet::HttpServer> interface = ememory::dynamicPointerCast<enet::HttpServer>(m_interface);
if (interface == nullptr) { if (interface == nullptr) {
ENET_ERROR("Nullptr interface ..."); ENET_ERROR("Nullptr interface ...");
return; return;