strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix -Werror,-Woverloaded-virtual warnings

Browse source 
Probably these were just not adapted by accident in commit
f70e627795 (WebSocket - simplify
handleMessage for now., 2020-03-05).

Change-Id: I578d95d938c0c466e9547dcda3d2b297dc347a34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90076
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
Miklos Vajna 2020-03-06 09:38:09 +01:00
parent a0ce834641
commit 797c996c56
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/WebSocketDump.cpp
View file

@ -42,9 +42,9 @@ public:
private:
/// Process incoming websocket messages
void handleMessage(bool fin, WSOpCode code, std::vector<char> &data)
void handleMessage(const std::vector<char> &data) override
{
std::cout << "WebSocket message code " << (int)code << " fin " << fin << " data:\n";
std::cout << "WebSocket message data:\n";
Util::dumpHex(std::cout, "", " ", data, false);
}
};

3
wsd/Admin.cpp
View file

@ -48,8 +48,7 @@ const int Admin::MinStatsIntervalMs = 50;
const int Admin::DefStatsIntervalMs = 1000;
/// Process incoming websocket messages
void AdminSocketHandler::handleMessage(bool /* fin */, WSOpCode /* code */,
std::vector<char> &payload)
void AdminSocketHandler::handleMessage(const std::vector<char> &payload)
{
// FIXME: check fin, code etc.
const std::string firstLine = getFirstLine(payload.data(), payload.size());

2
wsd/Admin.hpp
View file

@ -43,7 +43,7 @@ private:
void sendTextFrame(const std::string& message);
/// Process incoming websocket messages
void handleMessage(bool fin, WSOpCode code, std::vector<char> &data);
void handleMessage(const std::vector<char> &data) override;
private:
Admin* _admin;