loolwsd/LOOLWSD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 3b693ac735ea6ed6dce0ff00df5da408ff055d23 Author: Ashod Nakashian <[email protected]> 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 <[email protected]> Tested-by: Ashod Nakashian <[email protected]> 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)); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
