From 6b0fe3258a43159a0b2751cedae4d36bb9c09436 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 3 Oct 2012 16:02:22 -0500
Subject: [PATCH] Fix for mac/linux build
---
indra/llaudio/llaudiodecodemgr.cpp | 2 +-
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 6c97a64ed70..7768c3da0c1 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 892e144911b..115bf475532 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -234,7 +234,7 @@ class LL_COMMON_API LLThreadSafeRefCount
public:
LLThreadSafeRefCount();
LLThreadSafeRefCount(const LLThreadSafeRefCount&);
- LLThreadSafeRefCount&operator=(const LLThreadSafeRefCount& ref)
+ LLThreadSafeRefCount& operator=(const LLThreadSafeRefCount& ref)
{
if (sMutex)
{
@@ -245,6 +245,7 @@ class LL_COMMON_API LLThreadSafeRefCount
{
sMutex->unlock();
}
+ return *this;
}
--
GitLab