[Libreoffice-commits] online.git: kit/ForKit.cpp wsd/LOOLWSD.cpp

[Miklos Vajna]

 kit/ForKit.cpp  |    2 ++
 wsd/LOOLWSD.cpp |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f296c0ffeb60e5560eed79246ca877251f279c55
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 14 09:33:23 2017 +0100

    wsd: avoid redundant string initialization
    
    Change-Id: I5ac26d56c3b73e380d26226e83020ace3f1b54f4

diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index fa2bebe..ca58e2a 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -44,7 +44,9 @@
 using Poco::Process;
 using Poco::StringTokenizer;
 using Poco::Thread;
+#ifndef KIT_IN_PROCESS
 using Poco::Util::Application;
+#endif
 
 #ifndef KIT_IN_PROCESS
 static bool NoCapsForKit = false;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index c910f98..a79d631 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -150,9 +150,13 @@ using Poco::Net::SocketAddress;
 using Poco::Net::StreamSocket;
 using Poco::Net::WebSocket;
 using Poco::Path;
+#ifndef KIT_IN_PROCESS
 using Poco::Pipe;
+#endif
 using Poco::Process;
+#ifndef KIT_IN_PROCESS
 using Poco::ProcessHandle;
+#endif
 using Poco::StreamCopier;
 using Poco::StringTokenizer;
 using Poco::TemporaryFile;
@@ -1743,7 +1747,7 @@ bool LOOLWSD::NoCapsForKit = false;
 #endif
 #ifdef FUZZER
 bool LOOLWSD::DummyLOK = false;
-std::string LOOLWSD::FuzzFileName = "";
+std::string LOOLWSD::FuzzFileName;
 #endif
 std::string LOOLWSD::Cache = LOOLWSD_CACHEDIR;
 std::string LOOLWSD::SysTemplate;