loolwsd/ChildSession.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9d337fa1e03b811676793d798dcda408fe49b776
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jul 13 09:22:35 2016 +0200
ChildSession: no need to copy these function objects
diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 0f07e73..7923519 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -301,8 +301,8 @@ ChildSession::ChildSession(const std::string& id,
_multiView(std::getenv("LOK_VIEW_CALLBACK")),
_jailId(jailId),
_viewId(0),
- _onLoad(onLoad),
- _onUnload(onUnload),
+ _onLoad(std::move(onLoad)),
+ _onUnload(std::move(onUnload)),
_callbackWorker(new CallbackWorker(_callbackQueue, *this))
{
Log::info("ChildSession ctor [" + getName() + "].");
@@ -464,7 +464,7 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
}
else if (tokens[0] == "tile" || tokens[0] == "tilecombine")
{
- assert(!"Tile traffic should go through the DocumentBroker-LoKit WS.");
+ assert(false && "Tile traffic should go through the
DocumentBroker-LoKit WS.");
}
else
{
@@ -566,7 +566,7 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
}
else
{
- assert(!"Unknown command token.");
+ assert(false && "Unknown command token.");
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
