[PATCH] Compile without depending on the global MAX macro

Dirk Hohndel dirk at hohndel.org
Mon Oct 7 19:56:07 UTC 2013


On Mon, 2013-10-07 at 16:49 -0700, Thiago Macieira wrote:
> There's a C++ way for it. And, for some reason, it wasn't defined on my
> MinGW build:
> 
> qt-ui/profilegraphics.cpp:1006:57: error: 'MAX' was not declared in this sscope
> 
> Signed-off-by: Thiago Macieira <thiago at macieira.org>
> ---
>  qt-ui/profilegraphics.cpp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
> index d19623a..da7f2aa 100644
> --- a/qt-ui/profilegraphics.cpp
> +++ b/qt-ui/profilegraphics.cpp
> @@ -995,7 +995,7 @@ void ProfileGraphicsView::plot_depth_profile()
>  		marker = 9144;
>  		break;	/* 30 ft */
>  	}
> -	maxline = MAX(gc.pi.maxdepth + marker, maxdepth * 2 / 3);
> +    maxline = qMax(gc.pi.maxdepth + marker, maxdepth * 2 / 3);
>  
>  	c = getColor(DEPTH_GRID);
>  


Mumble, mumble, WHITESPACE, mumble, mumble...

Whitespace fixed and pushed.

/D



More information about the subsurface mailing list