Use std::min and std::max, not the misc versions.
This commit is contained in:
@ -114,8 +114,8 @@ void OOFPosRelMgr::getSize (Requisition *containerReq, int *oofWidth,
|
||||
if (posXDefined (child) && posYDefined (child)) {
|
||||
Requisition childReq;
|
||||
child->widget->sizeRequest (&childReq);
|
||||
*oofWidth = max (*oofWidth, getChildPosX (child) + childReq.width);
|
||||
*oofHeight = max (*oofHeight,
|
||||
*oofWidth = std::max (*oofWidth, getChildPosX (child) + childReq.width);
|
||||
*oofHeight = std::max (*oofHeight,
|
||||
getChildPosY (child) + childReq.ascent
|
||||
+ childReq.descent);
|
||||
|
||||
@ -144,10 +144,10 @@ void OOFPosRelMgr::getExtremes (Extremes *containerExtr, int *oofMinWidth,
|
||||
// Put the extremes of the container in relation to the extremes
|
||||
// of the child, as in OOFPosAbsLikeMgr::getExtremes (see
|
||||
// comment there).
|
||||
*oofMinWidth = max (*oofMinWidth,
|
||||
*oofMinWidth = std::max (*oofMinWidth,
|
||||
getChildPosX (child, containerExtr->minWidth)
|
||||
+ childExtr.minWidth);
|
||||
*oofMaxWidth = max (*oofMaxWidth,
|
||||
*oofMaxWidth = std::max (*oofMaxWidth,
|
||||
getChildPosX (child, containerExtr->maxWidth)
|
||||
+ childExtr.maxWidth);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user