From dde3ecc1a88f1838a77917d92341a0078b55c47e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Jan 2021 15:23:17 +0100 Subject: Cleanup: compiler warnings If one method is marked as override, clang warns if others are not. --- source/blender/compositor/operations/COM_RenderLayersProg.h | 9 +++++---- source/blender/compositor/operations/COM_SocketProxyOperation.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index ec98969b223..a0d5bc2953b 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -68,7 +68,8 @@ class RenderLayersProg : public NodeOperation { /** * Determine the output resolution. The resolution is retrieved from the Renderer */ - void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); + void determineResolution(unsigned int resolution[2], + unsigned int preferredResolution[2]) override; /** * retrieve the reference to the float buffer of the renderer. @@ -118,9 +119,9 @@ class RenderLayersProg : public NodeOperation { { return this->m_viewName; } - void initExecution(); - void deinitExecution(); - void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); + void initExecution() override; + void deinitExecution() override; + void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override; std::unique_ptr getMetaData() const override; }; diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h index 435083f5008..712347a8ea2 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.h +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h @@ -24,11 +24,11 @@ class SocketProxyOperation : public NodeOperation { public: SocketProxyOperation(DataType type, bool use_conversion); - bool isProxyOperation() const + bool isProxyOperation() const override { return true; } - bool useDatatypeConversion() const + bool useDatatypeConversion() const override { return m_use_conversion; } -- cgit v1.2.3