[Libreoffice-commits] online.git: common/SpookyV2.cpp wsd/LOOLWSD.cpp

Noel Grandin noel.grandin at collabora.co.uk
Tue Dec 27 10:14:49 UTC 2016


 common/SpookyV2.cpp |    2 +-
 wsd/LOOLWSD.cpp     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d425157f531b703d15fb00629f9ac8f9d79460c2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Dec 23 07:59:08 2016 +0200

    loplugin:literaltoboolconversion
    
    Change-Id: Ic38256273a8cad001fff6a3d7148a9b272acfa50
    Reviewed-on: https://gerrit.libreoffice.org/32361
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/common/SpookyV2.cpp b/common/SpookyV2.cpp
index 55f1cb1..c758a41 100644
--- a/common/SpookyV2.cpp
+++ b/common/SpookyV2.cpp
@@ -12,7 +12,7 @@
 #include <memory.h>
 #include "SpookyV2.h"
 
-#define ALLOW_UNALIGNED_READS 1
+#define ALLOW_UNALIGNED_READS true
 
 //
 // short hash ... it could be used on any message,
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9a9fa3a..a5a9282 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1697,10 +1697,10 @@ void LOOLWSD::initialize(Application& self)
     // In Trial Versions we might want to set some limits.
     LOOLWSD::NumConnections = 0;
     LOG_INF("Open Documents Limit: " <<
-            (MAX_DOCUMENTS ? std::to_string(MAX_DOCUMENTS) : std::string("unlimited")));
+            (MAX_DOCUMENTS != 0 ? std::to_string(MAX_DOCUMENTS) : std::string("unlimited")));
 
     LOG_INF("Client Connections Limit: " <<
-            (MAX_CONNECTIONS ? std::to_string(MAX_CONNECTIONS) : std::string("unlimited")));
+            (MAX_CONNECTIONS != 0 ? std::to_string(MAX_CONNECTIONS) : std::string("unlimited")));
 
     // Command Tracing.
     if (getConfigValue<bool>(conf, "trace[@enable]", false))


More information about the Libreoffice-commits mailing list