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

Even more compiler handholding

parent b303f6e6
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 43 deletions
......@@ -35,7 +35,7 @@
class LLTextureManagerBridge
{
public:
virtual ~LLTextureManagerBridge() {}
virtual ~LLTextureManagerBridge() = default;
virtual LLPointer<LLGLTexture> getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0;
virtual LLPointer<LLGLTexture> getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0;
......
......@@ -381,11 +381,3 @@ LLThreadSafeRefCount::~LLThreadSafeRefCount()
LL_ERRS() << "deleting referenced object mRef = " << mRef << LL_ENDL;
}
}
//============================================================================
LLResponder::~LLResponder()
{
}
//============================================================================
......@@ -152,7 +152,7 @@ void LLThread::unlockData()
class LL_COMMON_API LLResponder : public LLThreadSafeRefCount
{
protected:
virtual ~LLResponder();
virtual ~LLResponder() = default;
public:
virtual void completed(bool success) = 0;
};
......
......@@ -116,8 +116,8 @@ public:
//---------------------------------------------------------------------------------------------
//functions to access LLImageGL
//---------------------------------------------------------------------------------------------
/*virtual*/S32 getWidth(S32 discard_level = -1) const override;
/*virtual*/S32 getHeight(S32 discard_level = -1) const override;
/*virtual*/S32 getWidth(S32 discard_level = -1) const final override;
/*virtual*/S32 getHeight(S32 discard_level = -1) const final override;
BOOL hasGLTexture() const ;
LLGLuint getTexName() const ;
......@@ -155,7 +155,7 @@ public:
//---------------------------------------------------------------------------------------------
//-----------------
/*virtual*/ void setActive() override;
/*virtual*/ void setActive() final override;
void forceActive() ;
void setNoDelete() ;
void dontDiscard() { mDontDiscard = 1; mTextureState = NO_DELETE; }
......@@ -176,7 +176,7 @@ protected:
void setTexelsPerImage();
//note: do not make this function public.
/*virtual*/ LLImageGL* getGLTexture() const override;
/*virtual*/ LLImageGL* getGLTexture() const final override;
protected:
S32 mBoostLevel; // enum describing priority level
......
......@@ -24,8 +24,3 @@
*/
#include "linden_common.h"
#include "lltexture.h"
//virtual
LLTexture::~LLTexture()
{
}
......@@ -48,7 +48,7 @@ class LLTexture : public virtual LLRefCount, public LLTrace::MemTrackable<LLText
friend class LLFontGL ;
protected:
virtual ~LLTexture();
virtual ~LLTexture() = default;
public:
LLTexture()
......
......@@ -89,9 +89,9 @@ public:
return mFileName;
}
/*virtual*/ bool processRequest() override;
/*virtual*/ void finishRequest(bool completed) override;
/*virtual*/ void deleteRequest() override;
/*virtual*/ bool processRequest() final override;
/*virtual*/ void finishRequest(bool completed) final override;
/*virtual*/ void deleteRequest() final override;
private:
LLLFSThread* mThread;
......
......@@ -79,7 +79,7 @@ public:
//--------------------------------------------------------------------
public:
LLAgentCamera();
virtual ~LLAgentCamera();
~LLAgentCamera();
void init();
void cleanup();
void setAvatarObject(LLVOAvatarSelf* avatar);
......
......@@ -37,7 +37,7 @@
class LLVOAvatar;
class LLViewerJointMesh;
class LLPreviewAnimation : public LLViewerDynamicTexture
class LLPreviewAnimation final : public LLViewerDynamicTexture
{
protected:
virtual ~LLPreviewAnimation();
......
......@@ -39,7 +39,7 @@ class LLTextBox;
class LLVertexBuffer;
class LLVolume;
class LLImagePreviewSculpted : public LLViewerDynamicTexture
class LLImagePreviewSculpted final : public LLViewerDynamicTexture
{
protected:
virtual ~LLImagePreviewSculpted();
......@@ -72,7 +72,7 @@ protected:
};
class LLImagePreviewAvatar : public LLViewerDynamicTexture
class LLImagePreviewAvatar final : public LLViewerDynamicTexture
{
protected:
virtual ~LLImagePreviewAvatar();
......
......@@ -230,7 +230,7 @@ private:
};
class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
class LLModelPreview final : public LLViewerDynamicTexture, public LLMutex
{
typedef boost::signals2::signal<void (F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost)> details_signal_t;
typedef boost::signals2::signal<void (void)> model_loaded_signal_t;
......
......@@ -37,7 +37,7 @@ class LLViewerObject;
const S32 NUM_POINTS = 5;
class LLHUDEffectBeam : public LLHUDEffect
class LLHUDEffectBeam final : public LLHUDEffect
{
public:
/*virtual*/ void setSourceObject(LLViewerObject *objp) final override;
......
......@@ -30,7 +30,7 @@
#include "llhudeffect.h"
#include "lluiimage.h"
class LLHUDEffectBlob : public LLHUDEffect
class LLHUDEffectBlob final : public LLHUDEffect
{
public:
friend class LLHUDObject;
......
......@@ -50,7 +50,7 @@ typedef enum e_lookat_type
LOOKAT_NUM_TARGETS
} ELookAtType;
class LLHUDEffectLookAt : public LLHUDEffect
class LLHUDEffectLookAt final : public LLHUDEffect
{
public:
friend class LLHUDObject;
......
......@@ -42,7 +42,7 @@ typedef enum e_pointat_type
POINTAT_NUM_TARGETS
} EPointAtType;
class LLHUDEffectPointAt : public LLHUDEffect
class LLHUDEffectPointAt final : public LLHUDEffect
{
public:
friend class LLHUDObject;
......
......@@ -39,7 +39,7 @@ class LLViewerObject;
constexpr U32 NUM_TRAIL_POINTS = 40;
class LLHUDEffectSpiral : public LLHUDEffect
class LLHUDEffectSpiral final : public LLHUDEffect
{
public:
/*virtual*/ void markDead() final override;
......
......@@ -41,7 +41,7 @@
// Renders a 2D icon billboard floating at the location specified.
class LLViewerTexture;
class LLHUDIcon : public LLHUDObject
class LLHUDIcon final : public LLHUDObject
{
friend class LLHUDObject;
......
......@@ -48,7 +48,7 @@ struct llhudnametag_further_away
bool operator()(const LLPointer<LLHUDNameTag>& lhs, const LLPointer<LLHUDNameTag>& rhs) const;
};
class LLHUDNameTag : public LLHUDObject
class LLHUDNameTag final : public LLHUDObject
{
protected:
class LLHUDTextSegment
......
......@@ -46,7 +46,7 @@ struct lltextobject_further_away
bool operator()(const LLPointer<LLHUDText>& lhs, const LLPointer<LLHUDText>& rhs) const;
};
class LLHUDText : public LLHUDObject
class LLHUDText final : public LLHUDObject
{
protected:
class LLHUDTextSegment
......
......@@ -59,7 +59,7 @@ class LLTextureCacheWorker : public LLWorkerClass
friend class LLTextureCache;
private:
class ReadResponder : public LLLFSThread::Responder
class ReadResponder final : public LLLFSThread::Responder
{
public:
ReadResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
......@@ -75,7 +75,7 @@ private:
LLTextureCacheWorker::handle_t mHandle;
};
class WriteResponder : public LLLFSThread::Responder
class WriteResponder final : public LLLFSThread::Responder
{
public:
WriteResponder(LLTextureCache* cache, handle_t handle) : mCache(cache), mHandle(handle) {}
......@@ -136,9 +136,9 @@ public:
}
private:
void startWork(S32 param) override; // called from addWork() (MAIN THREAD)
void finishWork(S32 param, bool completed) override; // called from finishRequest() (WORK THREAD)
void endWork(S32 param, bool aborted) override; // called from doWork() (MAIN THREAD)
void startWork(S32 param) final override; // called from addWork() (MAIN THREAD)
void finishWork(S32 param, bool completed) final override; // called from finishRequest() (WORK THREAD)
void endWork(S32 param, bool aborted) final override; // called from doWork() (MAIN THREAD)
protected:
LLTextureCache* mCache;
......@@ -158,7 +158,7 @@ protected:
LLAtomicS32 mBytesRead;
};
class LLTextureCacheLocalFileWorker : public LLTextureCacheWorker
class LLTextureCacheLocalFileWorker final : public LLTextureCacheWorker
{
public:
LLTextureCacheLocalFileWorker(LLTextureCache* cache, U32 priority, const std::string& filename, const LLUUID& id,
......@@ -280,7 +280,7 @@ bool LLTextureCacheLocalFileWorker::doWrite()
return false;
}
class LLTextureCacheRemoteWorker : public LLTextureCacheWorker
class LLTextureCacheRemoteWorker final : public LLTextureCacheWorker
{
public:
LLTextureCacheRemoteWorker(LLTextureCache* cache, U32 priority, const LLUUID& id,
......
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