From d7dd5ad9d9f9e360ef686f51fe483d808026b22d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 4 Apr 2006 23:57:56 +0000
Subject: Re-fix sort by renaming min to minElem (avoid conflicts with certain
 system headers that #define min)

svn-id: r21618
---
 common/func.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/func.h b/common/func.h
index e2cd20fdb3..3d50670e3e 100644
--- a/common/func.h
+++ b/common/func.h
@@ -73,14 +73,14 @@ void sort(T first, T last) {
 	// Simple selection sort
 	T i(first);
 	for (; i != last; ++i) {
-		T min(i);
+		T minElem(i);
 		T j(i);
 		++j;
 		for (; j != last; ++j)
-			if (*j < *min)
-				min = j;
-		if (min != i)
-			SWAP(*min, *i);
+			if (*j < *minElem)
+				minElem = j;
+		if (minElem != i)
+			SWAP(*minElem, *i);
 	}
 }
 
-- 
cgit v1.2.3