[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLKit.cpp loolwsd/Storage.hpp

[Miklos Vajna]

 loolwsd/LOOLKit.cpp |    1 +
 loolwsd/Storage.hpp |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7552fcd8066471bb99091a6360ac9dfaf34e0344
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 23 09:35:46 2016 +0100

    loolwsd: work around -Werror,-Wunused-private-field

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 9b35eeb..4bc41fb 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -324,6 +324,7 @@ public:
         _docPasswordType(PasswordType::ToView),
         _clientViews(0)
     {
+        (void)_isDocLoaded; // FIXME LOOLBroker.cpp includes LOOLKit.cpp
         Log::info("Document ctor for url [" + _url + "] on child [" + _jailId +
                   "] LOK_VIEW_CALLBACK=" + std::to_string(_multiView) + ".");
     }
commit ae07c555bb771c0615ae25a753a01b540a0c807e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 23 09:32:25 2016 +0100

    loolwsd: fix -Werror,-Winconsistent-missing-override

diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp
index 7597783..1cf2991 100644
--- a/loolwsd/Storage.hpp
+++ b/loolwsd/Storage.hpp
@@ -42,7 +42,7 @@ public:
         return uri;
     }
 
-    bool restoreFileToURI(const std::string& path, const std::string& uri)
+    bool restoreFileToURI(const std::string& path, const std::string& uri) override
     {
         // Nothing to do.
         (void)path;
@@ -67,7 +67,7 @@ public:
         return uri;
     }
 
-    bool restoreFileToURI(const std::string& path, const std::string& uri)
+    bool restoreFileToURI(const std::string& path, const std::string& uri) override
     {
         // TODO: implement webdav PUT.
         (void)path;