From 4f9a5d0554c16a81625574a7a4ad6d5070e649e3 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Sat, 1 Dec 2012 12:49:01 -0800
Subject: [PATCH] fix for gcc compile errors
---
indra/llcommon/llapr.h | 4 ++--
indra/llcommon/llunit.h | 1 +
indra/newview/app_settings/logcontrol.xml | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index 7ca0f505efb..199b5291ddb 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -249,7 +249,7 @@ class LL_COMMON_API LLAPRFile : boost::noncopyable
//*******************************************************************************************************************************
};
-class LLThreadLocalPointerBase : LLInstanceTracker<LLThreadLocalPointerBase>
+class LLThreadLocalPointerBase : public LLInstanceTracker<LLThreadLocalPointerBase>
{
public:
LLThreadLocalPointerBase()
@@ -331,7 +331,7 @@ class LLThreadLocalPointer : public LLThreadLocalPointerBase
LLThreadLocalPointer(const LLThreadLocalPointer<T>& other)
- : LLThreadLocalPointerBase(other)
+ : LLThreadLocalPointerBase(other)
{
set(other.get());
}
diff --git a/indra/llcommon/llunit.h b/indra/llcommon/llunit.h
index fc1347b59fa..54902b6322e 100644
--- a/indra/llcommon/llunit.h
+++ b/indra/llcommon/llunit.h
@@ -177,6 +177,7 @@ template<typename UNIT_TYPE, typename STORAGE_TYPE>
struct LLUnitStrict : public LLUnit<UNIT_TYPE, STORAGE_TYPE>
{
typedef LLUnitStrict<UNIT_TYPE, STORAGE_TYPE> self_t;
+ typedef typename LLUnit<UNIT_TYPE, STORAGE_TYPE>::storage_t storage_t;
explicit LLUnitStrict(storage_t value = storage_t())
: LLUnit(value)
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index b9ae7ebf0bc..92a241857e0 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -42,7 +42,6 @@
</array>
<key>tags</key>
<array>
- <string>FastTimers</string>
<!-- sample entry for debugging specific items
<string>Avatar</string>
<string>Voice</string>
--
GitLab