Use std::min and std::max, not the misc versions.
This commit is contained in:
@ -39,7 +39,7 @@ Ruler::~Ruler ()
|
||||
|
||||
void Ruler::sizeRequestSimpl (core::Requisition *requisition)
|
||||
{
|
||||
requisition->width = lout::misc::max (getAvailWidth (true), boxDiffWidth ());
|
||||
requisition->width = std::max (getAvailWidth (true), boxDiffWidth ());
|
||||
requisition->ascent = boxOffsetY ();
|
||||
requisition->descent = boxRestHeight ();
|
||||
}
|
||||
@ -51,7 +51,7 @@ void Ruler::getExtremesSimpl (core::Extremes *extremes)
|
||||
extremes->maxWidthIntrinsic = extremes->maxWidth;
|
||||
correctExtremes (extremes, false);
|
||||
extremes->adjustmentWidth =
|
||||
lout::misc::min (extremes->minWidthIntrinsic, extremes->minWidth);
|
||||
std::min (extremes->minWidthIntrinsic, extremes->minWidth);
|
||||
}
|
||||
|
||||
bool Ruler::isBlockLevel ()
|
||||
|
||||
Reference in New Issue
Block a user