diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-09-05 12:50:25 +0400 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-09-05 12:50:25 +0400 |
commit | 7efe2153b2a04322b312cacba60168c0db470f95 (patch) | |
tree | dc25b7aa2827696a4af6cc5c4f4a99bce65f47f3 | |
parent | f3a91f461ca94557a8125915544676cc765a5709 (diff) |
* gcc 4.7 is more strict. This patch will remove 'non virtual
destructor warnings' in the core of the compositor.
-rw-r--r-- | source/blender/compositor/intern/COM_Device.h | 7 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_NodeBase.h | 3 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_Socket.h | 8 |
3 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index e33a2a4288f..dc39b2baca7 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -31,8 +31,15 @@ * work are packaged as a WorkPackage instance. */ class Device { + public: /** + * @brief Declaration of the virtual destructor + * @note resolve warning gcc 4.7 + */ + virtual ~Device() {} + + /** * @brief initialize the device */ virtual bool initialize() { return true; } diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h index 3c390f6bcdb..b55e444be80 100644 --- a/source/blender/compositor/intern/COM_NodeBase.h +++ b/source/blender/compositor/intern/COM_NodeBase.h @@ -71,13 +71,14 @@ protected: inline vector<OutputSocket *>& getOutputSockets() { return this->m_outputsockets; } -public: +protected: /** * @brief destructor * clean up memory related to this NodeBase. */ virtual ~NodeBase(); +public: /** * @brief get the reference to the SDNA bNode struct */ diff --git a/source/blender/compositor/intern/COM_Socket.h b/source/blender/compositor/intern/COM_Socket.h index 2aebe262594..bad112d20c7 100644 --- a/source/blender/compositor/intern/COM_Socket.h +++ b/source/blender/compositor/intern/COM_Socket.h @@ -62,6 +62,14 @@ private: DataType m_datatype; bNodeSocket *m_editorSocket; + +protected: + /** + * @brief Declaration of the virtual destructor + * @note resolve warning gcc 4.7 + */ + virtual ~Socket() {} + public: Socket(DataType datatype); |