From 018d941daf310e5f79c4c102d075149ba4dfe50f Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 2 Jun 2012 14:20:22 +0000 Subject: Fixed Linux compilation complaining about min() and max(), hopefully forever. Use std::min() and std::max() git-svn-id: http://mc-server.googlecode.com/svn/trunk@539 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Trees.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'source/Trees.cpp') diff --git a/source/Trees.cpp b/source/Trees.cpp index 1259f1edd..7d82c3ef9 100644 --- a/source/Trees.cpp +++ b/source/Trees.cpp @@ -11,14 +11,6 @@ -#ifndef min - #define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - - - - - typedef struct { int x, z; @@ -454,7 +446,7 @@ void GetPineTreeImage(int a_BlockX, int a_BlockY, int a_BlockZ, cNoise & a_Noise // LOGD("Generating %d layers of pine leaves, SameSizeMax = %d", NumLeavesLayers, SameSizeMax); for (int i = 0; i < NumLeavesLayers; ++i) { - int LayerSize = min(i, NumLeavesLayers - i + SameSizeMax - 1); + int LayerSize = std::min(i, NumLeavesLayers - i + SameSizeMax - 1); // LOGD("LayerSize %d: %d", i, LayerSize); if (LayerSize < 0) { -- cgit v1.2.3