diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-10-03 16:02:22 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-10-03 16:02:22 -0500 |
| commit | 6b0fe3258a43159a0b2751cedae4d36bb9c09436 (patch) | |
| tree | 04e453fb45021cce7cd747793bf630eb979aae53 /indra | |
| parent | 20e1f567d5c09df10fe120fde0d5f294eff0fff4 (diff) | |
Fix for mac/linux build
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llthread.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 6c97a64ed7..7768c3da0c 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -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, diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 892e144911..115bf47553 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -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; } |