loolwsd/Makefile.am | 3 +++
loolwsd/MessageQueue.cpp | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1fb94f0abb84e586542e7c097726f4340f4c2b3d
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 17 18:49:34 2015 +0100
loolwsd: We want to build and link with -pthread.
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 357986d..cfc3f41 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -4,6 +4,9 @@ bin_PROGRAMS = loolwsd
dist_bin_SCRIPTS = loolwsd-systemplate-setup
+AM_CPPFLAGS = -pthread
+AM_LDFLAGS = -pthread
+
loolwsd_SOURCES = LOOLWSD.cpp LOOLSession.cpp MessageQueue.cpp TileCache.cpp
Util.cpp LOOLProtocol.cpp
noinst_PROGRAMS = loadtest connect lokitclient
commit dacd176c84462ee3ad3744be2b6d5f97af972d8b
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 17 18:47:58 2015 +0100
loolwsd: We wanted to call the _impl() version.
This was in preparation for a more complex Queue; maybe we should just
remove
the non-needed _impl() versions again (?)
diff --git a/loolwsd/MessageQueue.cpp b/loolwsd/MessageQueue.cpp
index 65fd0e5..8e28585 100644
--- a/loolwsd/MessageQueue.cpp
+++ b/loolwsd/MessageQueue.cpp
@@ -34,7 +34,7 @@ std::string MessageQueue::get()
void MessageQueue::clear()
{
std::unique_lock<std::mutex> lock(_mutex);
- _queue.clear();
+ clear_impl();
}
void MessageQueue::put_impl(const std::string& value)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
