From e9a67be7aedbfc1ea6a770648f8e320520a34d06 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 15 Jul 2016 21:22:11 +0200 Subject: [PATCH] [DEV] update new ememory::SharedPtr --- enet/WebSocket.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/enet/WebSocket.cpp b/enet/WebSocket.cpp index 87cd77b..d8aa0a4 100644 --- a/enet/WebSocket.cpp +++ b/enet/WebSocket.cpp @@ -42,13 +42,13 @@ enet::WebSocket::WebSocket(enet::Tcp _connection, bool _isServer) : m_observerUriCheck(nullptr) { _connection.setTCPNoDelay(true); if (_isServer == true) { - ememory::SharedPtr interface = std::make_shared(std::move(_connection)); + ememory::SharedPtr interface = ememory::makeShared(std::move(_connection)); m_interface = interface; if (interface != nullptr) { interface->connectHeader(this, &enet::WebSocket::onReceiveRequest); } } else { - ememory::SharedPtr interface = std::make_shared(std::move(_connection)); + ememory::SharedPtr interface = ememory::makeShared(std::move(_connection)); m_interface = interface; if (interface != nullptr) { 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) { _connection.setTCPNoDelay(true); if (_isServer == true) { - ememory::SharedPtr interface = std::make_shared(std::move(_connection)); + ememory::SharedPtr interface = ememory::makeShared(std::move(_connection)); m_interface = interface; if (interface != nullptr) { interface->connectHeader(this, &enet::WebSocket::onReceiveRequest); } } else { - ememory::SharedPtr interface = std::make_shared(std::move(_connection)); + ememory::SharedPtr interface = ememory::makeShared(std::move(_connection)); m_interface = interface; if (interface != nullptr) { interface->connectHeader(this, &enet::WebSocket::onReceiveAnswer); @@ -139,7 +139,7 @@ void enet::WebSocket::start(const std::string& _uri, const std::vector interface = std::dynamic_pointer_cast(m_interface); + ememory::SharedPtr interface = ememory::dynamicPointerCast(m_interface); if (interface != nullptr) { interface->setHeader(req); 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) { - ememory::SharedPtr interface = std::dynamic_pointer_cast(m_interface); + ememory::SharedPtr interface = ememory::dynamicPointerCast(m_interface); if (interface == nullptr) { ENET_ERROR("Nullptr interface ..."); return;