Skip to content
Snippets Groups Projects
Commit ed6fc0d5 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

override warnings

parent 80cd8166
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ class LLToolSelectRect; ...@@ -17,7 +17,7 @@ class LLToolSelectRect;
class ALToolAlign final class ALToolAlign final
: public LLTool, public LLSingleton<ALToolAlign> : public LLTool, public LLSingleton<ALToolAlign>
{ {
LLSINGLETON(ALToolAlign); LLSINGLETON_C11(ALToolAlign);
~ALToolAlign() = default; ~ALToolAlign() = default;
public: public:
......
...@@ -43,7 +43,7 @@ class LLInventoryItem; ...@@ -43,7 +43,7 @@ class LLInventoryItem;
class LLGLSLShader; class LLGLSLShader;
//========================================================================= //=========================================================================
class LLSettingsVOBase final : public LLSettingsBase class LLSettingsVOBase : public LLSettingsBase
{ {
public: public:
typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)> asset_download_fn; typedef std::function<void(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status, LLExtStat extstat)> asset_download_fn;
......
...@@ -64,7 +64,7 @@ class LLTextureFetch : public LLWorkerThread ...@@ -64,7 +64,7 @@ class LLTextureFetch : public LLWorkerThread
class TFRequest; class TFRequest;
// Threads: Tmain // 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. // called in the main thread after the TextureCacheThread shuts down.
// Threads: Tmain // Threads: Tmain
...@@ -246,20 +246,20 @@ class LLTextureFetch : public LLWorkerThread ...@@ -246,20 +246,20 @@ class LLTextureFetch : public LLWorkerThread
// Overrides from the LLThread tree // Overrides from the LLThread tree
// Locks: Ct // Locks: Ct
bool runCondition(); bool runCondition() override;
private: private:
// Threads: Tmain // Threads: Tmain
void sendRequestListToSimulators(); void sendRequestListToSimulators();
// Threads: Ttf // Threads: Ttf
/*virtual*/ void startThread(void); /*virtual*/ void startThread(void) override;
// Threads: Ttf // Threads: Ttf
/*virtual*/ void endThread(void); /*virtual*/ void endThread(void) override;
// Threads: Ttf // Threads: Ttf
/*virtual*/ void threadedUpdate(void); /*virtual*/ void threadedUpdate(void) override;
// Threads: Ttf // Threads: Ttf
void commonUpdate(); void commonUpdate();
......
...@@ -92,7 +92,7 @@ struct RlvBehaviourModifierTween ...@@ -92,7 +92,7 @@ struct RlvBehaviourModifierTween
class RlvBehaviourModifierAnimator final : public LLSingleton<RlvBehaviourModifierAnimator> class RlvBehaviourModifierAnimator final : public LLSingleton<RlvBehaviourModifierAnimator>
{ {
LLSINGLETON_EMPTY_CTOR(RlvBehaviourModifierAnimator); LLSINGLETON_EMPTY_CTOR_C11(RlvBehaviourModifierAnimator);
public: public:
~RlvBehaviourModifierAnimator() override; ~RlvBehaviourModifierAnimator() override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment