From 03ed75018fe47f79be2cb5e52c5ead02194a2e6d Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Thu, 5 Oct 2006 10:32:57 +0000
Subject: [PATCH] Fix compile for apple's g++ 4.0.1.

---
 stepmania/src/EnumHelper.h  | 4 ++--
 stepmania/src/ThemeMetric.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/EnumHelper.h b/stepmania/src/EnumHelper.h
index fffa043882..72ab3cbfba 100644
--- a/stepmania/src/EnumHelper.h
+++ b/stepmania/src/EnumHelper.h
@@ -61,6 +61,8 @@ struct EnumTraits
 	static T Invalid;
 	static const char *szName;
 };
+template<typename T> LuaReference EnumTraits<T>::StringToEnum;
+template<typename T> LuaReference EnumTraits<T>::EnumToString;
 
 namespace Enum
 {
@@ -156,8 +158,6 @@ static void Lua##X(lua_State* L) \
 	lua_setglobal( L, #X "Index" ); \
 } \
 REGISTER_WITH_LUA_FUNCTION( Lua##X ); \
-template<> LuaReference EnumTraits<X>::StringToEnum; \
-template<> LuaReference EnumTraits<X>::EnumToString; \
 template<> X EnumTraits<X>::Invalid = enum_add2( NUM_##X, 1 ); \
 template<> const char *EnumTraits<X>::szName = #X; \
 bool LuaHelpers::FromStack( lua_State *L, X &Object, int iOffset ) { Object = Enum::Check<X>( L, iOffset ); return true; } \
diff --git a/stepmania/src/ThemeMetric.h b/stepmania/src/ThemeMetric.h
index 364c2d8876..48a4b4547e 100644
--- a/stepmania/src/ThemeMetric.h
+++ b/stepmania/src/ThemeMetric.h
@@ -72,9 +72,10 @@ public:
 	{
 		if( m_sName != ""  &&  THEME  &&   THEME->IsThemeLoaded() )
 		{
+			using namespace LuaHelpers;
 			Lua *L = LUA->Get();
 			THEME->PushMetric( L, m_sGroup, m_sName );
-			if( !LuaHelpers::FromStack(L, m_currentValue, -1) )
+			if( !FromStack(L, m_currentValue, -1) )
 				m_currentValue = T();
 			lua_pop( L, 1 );
 			LUA->Release(L);