From 7ecaf1f982b852ef971b3fe209825ad407578a07 Mon Sep 17 00:00:00 2001 From: dimon4eg Date: Thu, 9 May 2019 01:05:47 +0300 Subject: [PATCH] rename ptr --- ixwebsocket/IXWebSocketMessageQueue.cpp | 8 ++++---- ixwebsocket/IXWebSocketMessageQueue.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ixwebsocket/IXWebSocketMessageQueue.cpp b/ixwebsocket/IXWebSocketMessageQueue.cpp index 222478d8..62e759bd 100644 --- a/ixwebsocket/IXWebSocketMessageQueue.cpp +++ b/ixwebsocket/IXWebSocketMessageQueue.cpp @@ -47,7 +47,7 @@ namespace ix const WebSocketOpenInfo& openInfo, const WebSocketCloseInfo& closeInfo) { - MessageDataPtr message(new Message()); + MessagePtr message(new Message()); message->type = type; message->str = str; @@ -69,9 +69,9 @@ namespace ix _onMessageUserCallback = callback; } - WebSocketMessageQueue::MessageDataPtr WebSocketMessageQueue::popMessage() + WebSocketMessageQueue::MessagePtr WebSocketMessageQueue::popMessage() { - MessageDataPtr message; + MessagePtr message; std::lock_guard lock(_messagesMutex); if (!_messages.empty()) @@ -88,7 +88,7 @@ namespace ix if (!_onMessageUserCallback) return; - MessageDataPtr message; + MessagePtr message; while (count > 0 && (message = popMessage())) { diff --git a/ixwebsocket/IXWebSocketMessageQueue.h b/ixwebsocket/IXWebSocketMessageQueue.h index 961f57e2..543189e9 100644 --- a/ixwebsocket/IXWebSocketMessageQueue.h +++ b/ixwebsocket/IXWebSocketMessageQueue.h @@ -39,14 +39,14 @@ namespace ix WebSocketCloseInfo closeInfo; }; - using MessageDataPtr = std::shared_ptr; + using MessagePtr = std::shared_ptr; - MessageDataPtr popMessage(); + MessagePtr popMessage(); private: WebSocket* _websocket = nullptr; OnMessageCallback _onMessageUserCallback; std::mutex _messagesMutex; - std::list _messages; + std::list _messages; }; }