From daa07d031c6c18c8401457c84ef14d722c97f643 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 12 Oct 2013 12:13:58 -0500
Subject: [PATCH] Fixed a couple of compilation errors when using GCC.

---
 indra/llaudio/llaudioengine.cpp        | 5 -----
 indra/llaudio/llaudioengine_fmodex.cpp | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 62a804f9b..19d37c131 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -277,11 +277,6 @@ void LLAudioEngine::updateChannels()
 					}
 				}
 				llassert(found_buffer);
-				if(!mChannels[i]->mCurrentBufferp->mInUse)
-				{
-					llassert(!mChannels[i]->isPlaying());
-					llassert(!mChannels[i]->isWaiting());
-				}
 			}
 #endif //SHOW_ASSERT
 		}
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index deb27e11d..0c297494d 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -178,7 +178,7 @@ public:
 	}
 	void removeChannel(FMOD::Channel* channel)
 	{
-		gSoundCheck.assertActiveState(channel,true);
+		assertActiveState(channel,true);
 
 		active_channels_t::const_iterator it = mActiveChannels.find(channel);
 		llassert(it != mActiveChannels.end());
@@ -208,7 +208,7 @@ public:
 		if(try_log && sVerboseDebugging)
 #endif
 		{
-			CFMODSoundChecks::STATUS chan = gSoundCheck.getPtrStatus(ptr);
+			CFMODSoundChecks::STATUS chan = getPtrStatus(ptr);
 			if(try_log && sVerboseDebugging)
 			{
 				if(active)