Use std::min and std::max, not the misc versions.
This commit is contained in:
@ -1,8 +1,12 @@
|
||||
static_assert( __cplusplus >= 2020'02 );
|
||||
|
||||
#ifndef __DW_TEXTBLOCK_HH__
|
||||
#define __DW_TEXTBLOCK_HH__
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "regardingborder.hh"
|
||||
#include "../lout/misc.hh"
|
||||
|
||||
@ -401,8 +405,8 @@ protected:
|
||||
inline int totalHeight (int marginNextLine)
|
||||
{ return borderAscent + borderDescent
|
||||
// Collapsing of the margins of adjacent lines is done here:
|
||||
+ lout::misc::max (marginDescent - borderDescent, marginNextLine,
|
||||
breakSpace); }
|
||||
+ std::max( marginDescent - borderDescent, std::max( marginNextLine,
|
||||
breakSpace ) ); }
|
||||
|
||||
/* Maximum of all line widths, including this line. Does not
|
||||
* include the last space, but the last hyphen width. Please
|
||||
|
||||
Reference in New Issue
Block a user