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

Warning fixes to rlva

parent 832b2843
No related branches found
No related tags found
No related merge requests found
...@@ -404,11 +404,7 @@ inline bool operator!=(const LLVector3d& a, const LLVector3d& b) ...@@ -404,11 +404,7 @@ inline bool operator!=(const LLVector3d& a, const LLVector3d& b)
// [RLVa:KB] - RlvBehaviourModifierCompMin/Max // [RLVa:KB] - RlvBehaviourModifierCompMin/Max
inline bool operator<(const LLVector3d& lhs, const LLVector3d& rhs) inline bool operator<(const LLVector3d& lhs, const LLVector3d& rhs)
{ {
return (lhs.mdV[0] < rhs.mdV[0] return std::tie(lhs.mdV[0], lhs.mdV[1], lhs.mdV[2]) < std::tie(rhs.mdV[0], rhs.mdV[1], rhs.mdV[2]);
|| (lhs.mdV[0] == rhs.mdV[0]
&& (lhs.mdV[1] < rhs.mdV[1]
|| ((lhs.mdV[1] == rhs.mdV[1])
&& lhs.mdV[2] < rhs.mdV[2]))));
} }
// [/RLVa:KB] // [/RLVa:KB]
......
...@@ -479,13 +479,7 @@ inline LLVector4 operator-(const LLVector4 &a) ...@@ -479,13 +479,7 @@ inline LLVector4 operator-(const LLVector4 &a)
// [RLVa:KB] - RlvBehaviourModifierCompMin/Max // [RLVa:KB] - RlvBehaviourModifierCompMin/Max
inline bool operator<(const LLVector4& lhs, const LLVector4& rhs) inline bool operator<(const LLVector4& lhs, const LLVector4& rhs)
{ {
return (lhs.mV[0] < rhs.mV[0] return std::tie(lhs.mV[0], lhs.mV[1], lhs.mV[2], lhs.mV[3]) < std::tie(rhs.mV[0], rhs.mV[1], rhs.mV[2], rhs.mV[3]);
|| (lhs.mV[0] == rhs.mV[0]
&& (lhs.mV[1] < rhs.mV[1]
|| ((lhs.mV[1] == rhs.mV[1])
&& lhs.mV[2] < rhs.mV[2]
|| ((lhs.mV[2] == rhs.mV[2])
&& lhs.mV[3] < rhs.mV[3])))));
} }
// [/RLVa:KB] // [/RLVa:KB]
......
...@@ -49,7 +49,7 @@ struct LLVisualEffectParams ...@@ -49,7 +49,7 @@ struct LLVisualEffectParams
virtual void step(bool isLast) = 0; virtual void step(bool isLast) = 0;
}; };
struct LLShaderEffectParams : LLVisualEffectParams struct LLShaderEffectParams final : LLVisualEffectParams
{ {
explicit LLShaderEffectParams(LLRenderTarget* pSrcBuffer, LLRenderTarget* pScratchBuffer, bool fBindLast) : m_pSrcBuffer(pScratchBuffer), m_pDstBuffer(pSrcBuffer), m_fBindLast(fBindLast) {} explicit LLShaderEffectParams(LLRenderTarget* pSrcBuffer, LLRenderTarget* pScratchBuffer, bool fBindLast) : m_pSrcBuffer(pScratchBuffer), m_pDstBuffer(pSrcBuffer), m_fBindLast(fBindLast) {}
...@@ -103,7 +103,7 @@ class LLTweenableValue ...@@ -103,7 +103,7 @@ class LLTweenableValue
{ {
public: public:
LLTweenableValue(const T& defaultValue) : m_CurValue(defaultValue) {} LLTweenableValue(const T& defaultValue) : m_CurValue(defaultValue) {}
virtual ~LLTweenableValue() {} virtual ~LLTweenableValue() = default;
virtual T get() = 0; virtual T get() = 0;
virtual void start(const T& endValue, double duration) = 0; virtual void start(const T& endValue, double duration) = 0;
...@@ -118,7 +118,7 @@ class LLTweenableValue ...@@ -118,7 +118,7 @@ class LLTweenableValue
}; };
template<typename T> template<typename T>
class LLTweenableValueLerp : public LLTweenableValue<T> class LLTweenableValueLerp final : public LLTweenableValue<T>
{ {
public: public:
LLTweenableValueLerp(const T& defaultValue) : LLTweenableValue<T>(defaultValue) {} LLTweenableValueLerp(const T& defaultValue) : LLTweenableValue<T>(defaultValue) {}
...@@ -148,11 +148,11 @@ class LLTweenableValueLerp : public LLTweenableValue<T> ...@@ -148,11 +148,11 @@ class LLTweenableValueLerp : public LLTweenableValue<T>
// //
// //
class LLVfxManager : public LLSingleton<LLVfxManager> class LLVfxManager final : public LLSingleton<LLVfxManager>
{ {
LLSINGLETON(LLVfxManager); LLSINGLETON(LLVfxManager);
protected: protected:
~LLVfxManager() {} ~LLVfxManager() = default;
/* /*
* Member functions * Member functions
......
...@@ -29,7 +29,7 @@ class LLViewerFetchedTexture; ...@@ -29,7 +29,7 @@ class LLViewerFetchedTexture;
// RlvOverlayEffect class // RlvOverlayEffect class
// //
class RlvOverlayEffect : public LLVisualEffect class RlvOverlayEffect final : public LLVisualEffect
{ {
public: public:
RlvOverlayEffect(const LLUUID& idRlvObj); RlvOverlayEffect(const LLUUID& idRlvObj);
...@@ -64,7 +64,7 @@ class RlvOverlayEffect : public LLVisualEffect ...@@ -64,7 +64,7 @@ class RlvOverlayEffect : public LLVisualEffect
// RlvSphereEffect class // RlvSphereEffect class
// //
class RlvSphereEffect : public LLVisualEffect class RlvSphereEffect final : public LLVisualEffect
{ {
public: public:
RlvSphereEffect(const LLUUID& idRlvObj); RlvSphereEffect(const LLUUID& idRlvObj);
......
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