[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/Makefile.am loolwsd/MessageQueue.cpp

[Jan Holesovsky]

 loolwsd/Makefile.am      |    3 +++
 loolwsd/MessageQueue.cpp |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6479da921c6e6f07280c72d12a45a2c0da8bed6b
Author: Jan Holesovsky <kendy at 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 5b13359ab6f91c908b2fbcc8f0f45e26f2a19867
Author: Jan Holesovsky <kendy at 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)