[Libreoffice-commits] online.git: loolwsd/UnitHTTP.hpp

[Tor Lillqvist]

 loolwsd/UnitHTTP.hpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1fcdb8beaa3375ba9ad26591e891209d9ca1dee2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Apr 8 09:29:45 2016 +0300

    expectContinue is gone in bleeding-edge Poco
    
    Put this inside #if, add the 'override' back for current Poco. Avoids
    "warning: 'expectContinue' overrides a member function but is not
    marked 'override'" when compiling against current Poco.
    
    Not sure what good it would do to define it at all if compiling
    against a bleeding-edge Poco as it won't call it anyway?

diff --git a/loolwsd/UnitHTTP.hpp b/loolwsd/UnitHTTP.hpp
index 53694ff..0f4c992 100644
--- a/loolwsd/UnitHTTP.hpp
+++ b/loolwsd/UnitHTTP.hpp
@@ -55,8 +55,10 @@ public:
         { setURI(uri); }
     virtual std::istream& stream() override
         { return *(static_cast<std::istream *>(nullptr)); }
-    virtual bool expectContinue() const /*override*/ // Some Poco version don't have this.
+#if POCO_VERSION < 0x02000000
+    virtual bool expectContinue() const override
         { return false; }
+#endif
     virtual bool secure() const { return true; }
 	virtual const SocketAddress& clientAddress() const override
         { return _clientAddress; }