Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2013-03-19 01:16:04 +0400
committerDalai Felinto <dfelinto@gmail.com>2013-03-19 01:16:04 +0400
commit650a44595b134e7451f52e1b250e52196373b8da (patch)
tree9e968abf92e4e5013dd1914cb07ad236ee64b3cb /source/blender/blenkernel/intern/node.c
parent95bcb9d2fb5e237c1bf9c1f46784a2241e77954e (diff)
fix for build error: "#pragma GCC diagnostic not allowed inside functions"
It works in a newest gcc (e.g. 4.6.3) but fails here: i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
-rw-r--r--source/blender/blenkernel/intern/node.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index c03e7bc7eac..7bcfe1f70e8 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1974,6 +1974,17 @@ 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)
{
@@ -2006,17 +2017,8 @@ static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out,
* but reconstructing own_index in writefile.c would require parsing the identifier string.
*/
-#ifdef __GNUC__
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
sock->own_index = own_index;
-#ifdef __GNUC__
-# pragma GCC diagnostic pop
-#endif
-
#endif /* USE_NODE_COMPAT_CUSTOMNODES */
sock->limit = (in_out == SOCK_IN ? 1 : 0xFFF);