[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50411] trunk/blender/source/blender/ compositor/intern: * gcc 4.7 is more strict.

[Jeroen Bakker]

Revision: 50411
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50411
Author:   jbakker
Date:     2012-09-05 08:50:25 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
 * gcc 4.7 is more strict. This patch will remove 'non virtual
destructor warnings' in the core of the compositor.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_Device.h
    trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
    trunk/blender/source/blender/compositor/intern/COM_Socket.h

Modified: trunk/blender/source/blender/compositor/intern/COM_Device.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Device.h	2012-09-05 08:12:22 UTC (rev 50410)
+++ trunk/blender/source/blender/compositor/intern/COM_Device.h	2012-09-05 08:50:25 UTC (rev 50411)
@@ -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; }

Modified: trunk/blender/source/blender/compositor/intern/COM_NodeBase.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeBase.h	2012-09-05 08:12:22 UTC (rev 50410)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeBase.h	2012-09-05 08:50:25 UTC (rev 50411)
@@ -71,13 +71,14 @@
 	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
 	 */

Modified: trunk/blender/source/blender/compositor/intern/COM_Socket.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Socket.h	2012-09-05 08:12:22 UTC (rev 50410)
+++ trunk/blender/source/blender/compositor/intern/COM_Socket.h	2012-09-05 08:50:25 UTC (rev 50411)
@@ -62,6 +62,14 @@
 	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);