kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename ptr

Browse Source
This commit is contained in:
dimon4eg 2019-05-09 01:05:47 +03:00
parent 75011d0b4e
commit a69408fa25
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ixwebsocket/IXWebSocketMessageQueue.cpp
View File

@ -47,7 +47,7 @@ namespace ix
const WebSocketOpenInfo& openInfo, const WebSocketOpenInfo& openInfo,
const WebSocketCloseInfo& closeInfo) const WebSocketCloseInfo& closeInfo)
{ {
MessageDataPtr message(new Message()); MessagePtr message(new Message());
message->type = type; message->type = type;
message->str = str; message->str = str;
@ -69,9 +69,9 @@ namespace ix
_onMessageUserCallback = callback; _onMessageUserCallback = callback;
} }
WebSocketMessageQueue::MessageDataPtr WebSocketMessageQueue::popMessage() WebSocketMessageQueue::MessagePtr WebSocketMessageQueue::popMessage()
{ {
MessageDataPtr message; MessagePtr message;
std::lock_guard<std::mutex> lock(_messagesMutex); std::lock_guard<std::mutex> lock(_messagesMutex);
if (!_messages.empty()) if (!_messages.empty())
@ -88,7 +88,7 @@ namespace ix
if (!_onMessageUserCallback) if (!_onMessageUserCallback)
return; return;
MessageDataPtr message; MessagePtr message;
while (count > 0 && (message = popMessage())) while (count > 0 && (message = popMessage()))
{ {

6
ixwebsocket/IXWebSocketMessageQueue.h
View File

@ -39,14 +39,14 @@ namespace ix
WebSocketCloseInfo closeInfo; WebSocketCloseInfo closeInfo;
}; };
using MessageDataPtr = std::shared_ptr<Message>; using MessagePtr = std::shared_ptr<Message>;
MessageDataPtr popMessage(); MessagePtr popMessage();
private: private:
WebSocket* _websocket = nullptr; WebSocket* _websocket = nullptr;
OnMessageCallback _onMessageUserCallback; OnMessageCallback _onMessageUserCallback;
std::mutex _messagesMutex; std::mutex _messagesMutex;
std::list<MessageDataPtr> _messages; std::list<MessagePtr> _messages;
}; };
} }