[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLWSD.cpp loolwsd/MasterProcessSession.cpp loolwsd/Util.hpp

[Miklos Vajna]

 loolwsd/LOOLWSD.cpp              |    4 ++--
 loolwsd/MasterProcessSession.cpp |    2 +-
 loolwsd/Util.hpp                 |    3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit e1a3a86ff3423d33834a0201db047287a9cdd5d5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 7 15:10:34 2016 +0100

    loolwsd: default initialization of an object of const type 'const struct ...
    
    ... _end_marker' without a user-provided default constructor
    
    Add one to make clang happy.

diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 4eec373..95dd5ef 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -96,6 +96,9 @@ namespace Log
 
     static const struct _end_marker
     {
+        _end_marker()
+        {
+        }
     } end;
 
     class StreamLogger
commit f0090d107ca271f6bcfc8e8c51af012b2d4dd317
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 7 15:09:35 2016 +0100

    loolwsd: -Werror,-Wshadow

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 5afeb6d..dbc4184 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -791,7 +791,7 @@ void LOOLWSD::displayHelp()
     helpFormatter.format(std::cout);
 }
 
-bool LOOLWSD::createBroker(const std::string& jailId)
+bool LOOLWSD::createBroker(const std::string& rJailId)
 {
     Process::Args args;
 
@@ -799,7 +799,7 @@ bool LOOLWSD::createBroker(const std::string& jailId)
     args.push_back("--systemplate=" + sysTemplate);
     args.push_back("--lotemplate=" + loTemplate);
     args.push_back("--childroot=" + childRoot);
-    args.push_back("--jailid=" + jailId);
+    args.push_back("--jailid=" + rJailId);
     args.push_back("--numprespawns=" + std::to_string(NumPreSpawnedChildren));
     args.push_back("--clientport=" + std::to_string(ClientPortNumber));
 
commit feb8648f056c49d1e9cf7a0e58f0c8e638c30f33
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jan 7 15:04:48 2016 +0100

    loolwsd: adding 'int' to a string does not append to the string

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 902b56f..7b7dac2 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -631,7 +631,7 @@ void MasterProcessSession::dispatchChild()
     oss << " jail=" << document->getJailedUri().toString();
 
     if (_loadPart >= 0)
-        oss << " part=" + _loadPart;
+        oss << " part=" + std::to_string(_loadPart);
 
     if (!_docOptions.empty())
         oss << " options=" << _docOptions;