From ed6fc0d55161d3905d42f9c8a5865a822abb19a7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 7 Nov 2020 02:01:22 -0500
Subject: [PATCH] override warnings
---
indra/newview/altoolalign.h | 2 +-
indra/newview/llsettingsvo.h | 2 +-
indra/newview/lltexturefetch.h | 10 +++++-----
indra/newview/rlvmodifiers.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/indra/newview/altoolalign.h b/indra/newview/altoolalign.h
index 1d5fc552d62..aece53e8c7f 100644
--- a/indra/newview/altoolalign.h
+++ b/indra/newview/altoolalign.h
@@ -17,7 +17,7 @@ class LLToolSelectRect;
class ALToolAlign final
: public LLTool, public LLSingleton<ALToolAlign>
{
- LLSINGLETON(ALToolAlign);
+ LLSINGLETON_C11(ALToolAlign);
~ALToolAlign() = default;
public:
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index e0f3153e27f..9a067d9d41e 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -43,7 +43,7 @@ class LLInventoryItem;
class LLGLSLShader;
//=========================================================================
-class LLSettingsVOBase final : public LLSettingsBase
+class LLSettingsVOBase : public LLSettingsBase
{
public:
typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)> asset_download_fn;
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 839cc366af5..0c645b9e133 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -64,7 +64,7 @@ class LLTextureFetch : public LLWorkerThread
class TFRequest;
// Threads: Tmain
- /*virtual*/ S32 update(F32 max_time_ms);
+ /*virtual*/ S32 update(F32 max_time_ms) override;
// called in the main thread after the TextureCacheThread shuts down.
// Threads: Tmain
@@ -246,20 +246,20 @@ class LLTextureFetch : public LLWorkerThread
// Overrides from the LLThread tree
// Locks: Ct
- bool runCondition();
+ bool runCondition() override;
private:
// Threads: Tmain
void sendRequestListToSimulators();
// Threads: Ttf
- /*virtual*/ void startThread(void);
+ /*virtual*/ void startThread(void) override;
// Threads: Ttf
- /*virtual*/ void endThread(void);
+ /*virtual*/ void endThread(void) override;
// Threads: Ttf
- /*virtual*/ void threadedUpdate(void);
+ /*virtual*/ void threadedUpdate(void) override;
// Threads: Ttf
void commonUpdate();
diff --git a/indra/newview/rlvmodifiers.h b/indra/newview/rlvmodifiers.h
index b26c1db0ebd..c690fb328b0 100644
--- a/indra/newview/rlvmodifiers.h
+++ b/indra/newview/rlvmodifiers.h
@@ -92,7 +92,7 @@ struct RlvBehaviourModifierTween
class RlvBehaviourModifierAnimator final : public LLSingleton<RlvBehaviourModifierAnimator>
{
- LLSINGLETON_EMPTY_CTOR(RlvBehaviourModifierAnimator);
+ LLSINGLETON_EMPTY_CTOR_C11(RlvBehaviourModifierAnimator);
public:
~RlvBehaviourModifierAnimator() override;
--
GitLab