[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Miklos Vajna]

 wsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1e8fc5334121cc413465599a71b41c5c3aed14b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 27 09:18:30 2017 +0200

    wsd: fix libstdc++-4.8 build
    
    error: no viable conversion from returned value of type 'bool' to
    function return type 'std::shared_ptr<DocumentBroker>'
    
    Change-Id: I5d4215ce61e5327ab702dbf6e4cc7be1330afed2

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ad1f4ece..bdad1aaf 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1259,7 +1259,7 @@ static std::shared_ptr<DocumentBroker> findOrCreateDocBroker(WebSocketHandler& w
         {
             LOG_WRN("DocBroker with docKey [" << docKey << "] that is marked to be destroyed. Rejecting client request.");
             ws.shutdown(WebSocketHandler::StatusCodes::ENDPOINT_GOING_AWAY, "error: cmd=load kind=docunloading");
-            return false;
+            return nullptr;
         }
     }
     else