From 03762409cd4f812d152e42de9c4f9853df91be0b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 18 Mar 2013 21:36:12 +0000 Subject: rewind 55389 and make this gcc4.6+ only --- source/blender/blenkernel/intern/node.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 7bcfe1f70e8..757571b9cf6 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1974,17 +1974,6 @@ void ntreeLocalMerge(bNodeTree *localtree, bNodeTree *ntree) /* ************ 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 @@ static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out, * 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); -- cgit v1.2.3