diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:36:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:36:12 +0400 |
| commit | 03762409cd4f812d152e42de9c4f9853df91be0b (patch) | |
| tree | 517ccf26298a9a594c7c2d55e42022b071047301 /source/blender/blenkernel | |
| parent | 743292421640c012f7a029ae2e0d9a312b01895f (diff) | |
rewind 55389 and make this gcc4.6+ only
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 20 |
1 files changed, 9 insertions, 11 deletions
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); |