loolwsd/DocumentBroker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0cdc9d70b501749de5d836b7043f5617583d105f Author: Andras Timar <andras.ti...@collabora.com> Date: Thu Oct 20 11:03:24 2016 +0200 loolwsd: fix error: declaration of âisLoadedâ shadows a member of 'this' [-Werror=shadow] diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp index 3960ef2..9ae52af 100644 --- a/loolwsd/DocumentBroker.cpp +++ b/loolwsd/DocumentBroker.cpp @@ -439,8 +439,8 @@ size_t DocumentBroker::addSession(std::shared_ptr<ClientSession>& session) _lastEditableSession = false; _markToDestroy = false; - bool isLoaded = load(id, std::to_string(_childProcess->getPid())); - if (!isLoaded) + bool loaded = load(id, std::to_string(_childProcess->getPid())); + if (!loaded) { Log::error("Error loading document with URI [" + session->getPublicUri().toString() + "]."); throw;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits