From 512d7381eca7bc53bb31e9528e5a7c5df189e82d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 11 Jan 2013 15:45:20 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system gcc 4.1 fixes

---
 indra/llcommon/llunit.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h
index c43ca2ba18..f43df3753a 100644
--- a/indra/llcommon/llunit.h
+++ b/indra/llcommon/llunit.h
@@ -76,8 +76,8 @@ struct LLUnit
 	typedef STORAGE_TYPE storage_t;
 
 	// default initialization
-	LLUnit()
-	:	mValue(storage_t())
+	LLUnit(storage_t value = storage_t())
+	:	mValue(value)
 	{}
 
 	// unit initialization and conversion
@@ -85,12 +85,6 @@ struct LLUnit
 	LLUnit(LLUnit<OTHER_UNIT, OTHER_STORAGE> other)
 	:	mValue(convert(other))
 	{}
-
-	// value initialization
-	template<typename CONVERTABLE_TYPE>
-	LLUnit(CONVERTABLE_TYPE value)
-	: mValue(value)
-	{}
 	
 	// value assignment
 	self_t& operator = (storage_t value)
-- 
cgit v1.2.3