* gcc 4.7 is more strict. This patch will remove 'non virtual

destructor warnings' in the core of the compositor.

diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h
index e33a2a4288fdde0969a0e9e803e2434726c2e757..dc39b2baca757dd0f40e9838bad4b0276fc985d1 100644 (file)
--- a/source/blender/compositor/intern/COM_Device.h
+++ b/source/blender/compositor/intern/COM_Device.h
@@ -31,7 +31,14 @@
  * 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
         */

diff --git a/source/blender/compositor/intern/COM_NodeBase.h b/source/blender/compositor/intern/COM_NodeBase.h
index 3c390f6bcdb4912797f6cc1eb0404e0b28d7b2f3..b55e444be8098cbc1882675cb18c658f6615fdd3 100644 (file)
--- 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 2aebe2625943123169f62058d8396b51031a12cf..bad112d20c74d51d7c17501b7cc342bb2123ee71 100644 (file)
--- 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);