From 60c6cab3f7c502c8daa01f569a7d2c58edf2fedb Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 5 Aug 2005 16:16:18 +0000
Subject: [PATCH] work around compiler bug (picks up the wrong "s")

---
 stepmania/src/ScreenOptionsEditCourseEntry.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
index 317d8b0798..dc9fdaad94 100644
--- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp
+++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
@@ -74,8 +74,8 @@ void ScreenOptionsEditCourseEntry::Init()
 	vector<CString> vsSongGroups;
 	SONGMAN->GetSongGroupNames( vsSongGroups );
 	def.m_vsChoices.push_back( "(any)" );
-	FOREACH_CONST( CString, vsSongGroups, s )
-		def.m_vsChoices.push_back( *s );
+	FOREACH_CONST( CString, vsSongGroups, song )
+		def.m_vsChoices.push_back( *song );
 	vDefs.push_back( def );
 	vHands.push_back( NULL );