[Libreoffice-commits] online.git: common/Log.cpp common/Util.cpp kit/ChildSession.hpp kit/Kit.cpp wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 common/Log.cpp       |    2 +-
 common/Util.cpp      |    1 -
 kit/ChildSession.hpp |    1 -
 kit/Kit.cpp          |    3 ---
 wsd/LOOLWSD.cpp      |    8 ++------
 5 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 5d0d3a4869332aea592ef468f653150c7d594cee
Author:     Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Nov 7 11:42:24 2019 +0100
Commit:     Jan Holesovsky <ke...@collabora.com>
CommitDate: Thu Nov 7 12:24:26 2019 +0100

    killpoco: Get rid of Poco/Thread.h from the rest of the Android-related 
files.
    
    Change-Id: I724230a4428cab3cc26245ac4aa43a91af2e09ce
    Reviewed-on: https://gerrit.libreoffice.org/82204
    Reviewed-by: Jan Holesovsky <ke...@collabora.com>
    Tested-by: Jan Holesovsky <ke...@collabora.com>

diff --git a/common/Log.cpp b/common/Log.cpp
index cdb72a903..bb9ba9d39 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <string>
 
+#include <Poco/AutoPtr.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/DateTimeFormatter.h>
 #include <Poco/FileChannel.h>
@@ -31,7 +32,6 @@
 #include <Poco/PatternFormatter.h>
 #include <Poco/Process.h>
 #include <Poco/SplitterChannel.h>
-#include <Poco/Thread.h>
 #include <Poco/Timestamp.h>
 
 #include "Log.hpp"
diff --git a/common/Util.cpp b/common/Util.cpp
index 49d465035..b493afeca 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -55,7 +55,6 @@
 #include <Poco/Process.h>
 #include <Poco/RandomStream.h>
 #include <Poco/TemporaryFile.h>
-#include <Poco/Thread.h>
 #include <Poco/Timestamp.h>
 #include <Poco/Util/Application.h>
 
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 7a5b16df8..88e445671 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -18,7 +18,6 @@
 #include <LibreOfficeKit/LibreOfficeKit.hxx>
 
 #include <Poco/Net/WebSocket.h>
-#include <Poco/Thread.h>
 
 #include "Common.hpp"
 #include "Kit.hpp"
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index cd397d397..4a152ef91 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -51,7 +51,6 @@
 #include <Poco/Process.h>
 #include <Poco/Runnable.h>
 #include <Poco/StringTokenizer.h>
-#include <Poco/Thread.h>
 #include <Poco/URI.h>
 
 #include "ChildSession.hpp"
@@ -97,7 +96,6 @@ using Poco::JSON::Array;
 using Poco::JSON::Object;
 using Poco::JSON::Parser;
 using Poco::StringTokenizer;
-using Poco::Thread;
 using Poco::URI;
 
 #ifndef BUILDING_TESTS
@@ -2057,7 +2055,6 @@ private:
     /// For showing disconnected user info in the doc repair dialog.
     std::map<int, UserInfo> _sessionUserInfo;
     std::chrono::steady_clock::time_point _lastMemStatsTime;
-    Poco::Thread _callbackThread;
 
     friend std::shared_ptr<lok::Document> getLOKDocument();
 };
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ac42e490a..583455d93 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -164,9 +164,6 @@ using Poco::Path;
 using Poco::StreamCopier;
 using Poco::StringTokenizer;
 using Poco::TemporaryFile;
-#if FUZZER
-using Poco::Thread;
-#endif
 using Poco::URI;
 using Poco::Util::Application;
 using Poco::Util::HelpFormatter;
@@ -1572,11 +1569,10 @@ void PrisonerPoll::wakeupHook()
 #endif
                         LOOLWSD::FuzzFileName));
 
-                std::unique_ptr<Thread> replayThread(new Thread());
-                replayThread->start(*replay);
+                std::thread replayThread([&replay]{ replay->run(); });
 
                 // block until the replay finishes
-                replayThread->join();
+                replayThread.join();
 
                 LOG_INF("Setting TerminationFlag");
                 SigUtil::setTerminationFlag();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits