Fix for mac/linux build

meow-7.2.2
Dave Parks 2012-10-03 16:02:22 -05:00
parent 20e1f567d5
commit 6b0fe3258a
2 changed files with 3 additions and 2 deletions

View File

@ -690,7 +690,7 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
return FALSE;
}
#if LL_DARWIN || LL_LINUX
#if LL_DARWIN
// HACK: to fool the compiler into not emitting unused warnings.
namespace {
const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY,

View File

@ -234,7 +234,7 @@ protected:
public:
LLThreadSafeRefCount();
LLThreadSafeRefCount(const LLThreadSafeRefCount&);
LLThreadSafeRefCount&operator=(const LLThreadSafeRefCount& ref)
LLThreadSafeRefCount& operator=(const LLThreadSafeRefCount& ref)
{
if (sMutex)
{
@ -245,6 +245,7 @@ public:
{
sMutex->unlock();
}
return *this;
}