[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Wed May 4 10:32:51 UTC 2016


 loolwsd/LOOLWSD.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b693ac735ea6ed6dce0ff00df5da408ff055d23
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Tue May 3 07:27:46 2016 -0400

    loolwsd: use return value of std::max
    
    Change-Id: Ifd4e06c1a646de8d3c2c67166b2e2c57fe2ab761
    Reviewed-on: https://gerrit.libreoffice.org/24636
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 77bdab1..55329af 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -222,7 +222,7 @@ static std::shared_ptr<ChildProcess> getNewChild()
         else
         {
             balance -= available - 1; // Minus the one we'll dispatch just now.
-            std::max(balance, 0);
+            balance = std::max(balance, 0);
         }
 
         Log::debug("getNewChild: Have " + std::to_string(available) + " children, forking " + std::to_string(balance));


More information about the Libreoffice-commits mailing list