[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55391] trunk/blender/source/blender/ blenkernel/intern/node.c: rewind 55389 and make this gcc4.6+ only

[Campbell Barton]

Revision: 55391
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55391
Author:   campbellbarton
Date:     2013-03-18 21:36:12 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
rewind 55389 and make this gcc4.6+ only 

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-18 21:33:48 UTC (rev 55390)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-03-18 21:36:12 UTC (rev 55391)
@@ -1974,17 +1974,6 @@
 
 /* ************ NODE TREE INTERFACE *************** */
 
-#ifdef USE_NODE_COMPAT_CUSTOMNODES
-#ifdef __GNUC__
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic pop
-#endif
-#endif  /* USE_NODE_COMPAT_CUSTOMNODES */
-
 static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out,
                                          const char *idname, const char *name)
 {
@@ -2017,8 +2006,17 @@
 	 * but reconstructing own_index in writefile.c would require parsing the identifier string.
 	 */
 
+#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406))
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 	sock->own_index = own_index;
 
+#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 406))
+#  pragma GCC diagnostic pop
+#endif
+
 #endif  /* USE_NODE_COMPAT_CUSTOMNODES */
 	
 	sock->limit = (in_out == SOCK_IN ? 1 : 0xFFF);