From 50c0447808f7041d5af5017c847a462e9599bdb5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 4 Oct 2011 13:26:54 -0700
Subject: disabled min and max windows macros another attempt at fixing gcc
 builds

---
 indra/llui/llui.h | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 8cec1a16f4..af8f239657 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -41,6 +41,7 @@
 #include <boost/signals2.hpp>
 #include "lllazyvalue.h"
 #include "llframetimer.h"
+#include <limits>
 
 // LLUIFactory
 #include "llsd.h"
@@ -150,27 +151,25 @@ public:
 	//
 	// Classes
 	//
+	template <typename T>
+	struct RangeParams : public LLInitParam::Block<RangeParams<T> >
+	{
+		Optional<T>	minimum,
+					maximum;
+
+		RangeParams()
+		:	minimum("min", T()),
+			maximum("max", std::numeric_limits<T>::max())
+		{}
+	};
 
 	template <typename T>
 	struct Range 
 	{
 		typedef Range<T> self_t;
 
-		struct Params : public LLInitParam::Block<Params>
-		{
-			typename Optional<T>	minimum,
-									maximum;
-
-			Params()
-			:	minimum("min", 0),
-				maximum("max", S32_MAX)
-			{
-
-			}
-		};
-
 		// correct for inverted params
-		Range(const Params& p = Params())
+		Range(const RangeParams<T>& p = RangeParams<T>())
 			:	mMin(p.minimum),
 			mMax(p.maximum)
 		{
@@ -228,12 +227,12 @@ public:
 	{
 		typedef Range<T> range_t;
 
-		struct Params : public LLInitParam::Block<Params, typename range_t::Params>
+		struct Params : public LLInitParam::Block<Params, RangeParams<T> >
 		{
-			Mandatory<S32> value;
+			Mandatory<T> value;
 
 			Params()
-			:	value("", 0)
+			:	value("", T())
 			{
 				addSynonym(value, "value");
 			}
-- 
cgit v1.2.3