[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.hpp loolwsd/MasterProcessSession.hpp
Miklos Vajna
vmiklos at collabora.co.uk
Wed Jan 6 23:38:08 PST 2016
loolwsd/ChildProcessSession.hpp | 8 ++++----
loolwsd/MasterProcessSession.hpp | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 956f470e5f3b1a37b0206176152d575899298c10
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Jan 7 08:35:24 2016 +0100
loolwsd: fix -Werror,-Winconsistent-missing-override
diff --git a/loolwsd/ChildProcessSession.hpp b/loolwsd/ChildProcessSession.hpp
index a24096e..9483aa0 100644
--- a/loolwsd/ChildProcessSession.hpp
+++ b/loolwsd/ChildProcessSession.hpp
@@ -38,9 +38,9 @@ public:
std::function<void(int)> onUnload);
virtual ~ChildProcessSession();
- virtual bool getStatus(const char *buffer, int length);
+ virtual bool getStatus(const char *buffer, int length) override;
- virtual bool getCommandValues(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual bool getCommandValues(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
virtual bool getPartPageRectangles(const char *buffer, int length) override;
@@ -54,9 +54,9 @@ public:
protected:
virtual bool loadDocument(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
- virtual void sendTile(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual void sendTile(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
- virtual void sendFontRendering(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual void sendFontRendering(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
bool clientZoom(const char *buffer, int length, Poco::StringTokenizer& tokens);
bool downloadAs(const char *buffer, int length, Poco::StringTokenizer& tokens);
diff --git a/loolwsd/MasterProcessSession.hpp b/loolwsd/MasterProcessSession.hpp
index 85a66fe..380def8 100644
--- a/loolwsd/MasterProcessSession.hpp
+++ b/loolwsd/MasterProcessSession.hpp
@@ -28,9 +28,9 @@ public:
static std::map<Poco::Process::PID, Poco::UInt64> _childProcesses;
- virtual bool getStatus(const char *buffer, int length);
+ virtual bool getStatus(const char *buffer, int length) override;
- virtual bool getCommandValues(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual bool getCommandValues(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
virtual bool getPartPageRectangles(const char *buffer, int length) override;
@@ -45,9 +45,9 @@ public:
virtual bool loadDocument(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
- virtual void sendTile(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual void sendTile(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
- virtual void sendFontRendering(const char *buffer, int length, Poco::StringTokenizer& tokens);
+ virtual void sendFontRendering(const char *buffer, int length, Poco::StringTokenizer& tokens) override;
void dispatchChild();
void forwardToPeer(const char *buffer, int length);
More information about the Libreoffice-commits
mailing list