From 486c887c62b29392cc35b42d5195611612c4de13 Mon Sep 17 00:00:00 2001
From: joris <joris.dauphin@gmail.com>
Date: Tue, 2 Jul 2013 11:57:07 +0200
Subject: [PATCH] use std::min, std::max
---
src/stratagus/script.cpp | 4 ++--
src/ui/botpanel.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp
index 98ccdc99e..44cad42c4 100644
--- a/src/stratagus/script.cpp
+++ b/src/stratagus/script.cpp
@@ -909,11 +909,11 @@ int EvalNumber(const NumberDesc *number)
case ENumber_Min : // a <= b ? a : b
a = EvalNumber(number->D.BinOp.Left);
b = EvalNumber(number->D.BinOp.Right);
- return (a <= b ? a : b);
+ return std::min(a, b);
case ENumber_Max : // a >= b ? a : b
a = EvalNumber(number->D.BinOp.Left);
b = EvalNumber(number->D.BinOp.Right);
- return (a >= b ? a : b);
+ return std::max(a, b);
case ENumber_Gt : // a > b ? 1 : 0
a = EvalNumber(number->D.BinOp.Left);
b = EvalNumber(number->D.BinOp.Right);
diff --git a/src/ui/botpanel.cpp b/src/ui/botpanel.cpp
index ceb6aa5c2..5294ae056 100644
--- a/src/ui/botpanel.cpp
+++ b/src/ui/botpanel.cpp
@@ -404,7 +404,7 @@ static void GetPopupSize(const CPopup &popup, const ButtonAction &button,
contentHeight = std::max(content.minSize.y, 2 * content.MarginY + content.GetHeight(button, Costs));
maxContentHeight = std::max(contentHeight, maxContentHeight);
if (content.Wrap) {
- popupWidth += contentWidth - maxContentWidth > 0 ? contentWidth - maxContentWidth : 0;
+ popupWidth += std::max(0, contentWidth - maxContentWidth);
popupHeight += maxContentHeight;
maxContentWidth = std::max(maxContentWidth, contentWidth);
contentWidth = popup.MarginX;