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
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 19:19:56 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-03-22 19:19:56 +0300
commit9f45f1a6b73218286d8b7bc9e1976bb3c4acb31e (patch)
tree75f7997a70996ba6039584b630ea5e9ec662a0f6 /extern
parent2a4c40f4b9240246e013c9c9587925c7eb5ea70d (diff)
GFlags: Fix usage of unused attribute
Diffstat (limited to 'extern')
-rw-r--r--extern/gflags/README.blender3
-rw-r--r--extern/gflags/src/gflags/gflags.h6
2 files changed, 8 insertions, 1 deletions
diff --git a/extern/gflags/README.blender b/extern/gflags/README.blender
index 1f6f0111776..68dba114329 100644
--- a/extern/gflags/README.blender
+++ b/extern/gflags/README.blender
@@ -21,3 +21,6 @@ Local modifications:
not trigger strict compiler warning.
- Did the same for CommandLineFlagParser::ValidateFlags().
+
+- Ifdef-ed __attribute((unused)) in gflags.h.
+ This file is compile-time configurable in upstream, so can not avoid change here.
diff --git a/extern/gflags/src/gflags/gflags.h b/extern/gflags/src/gflags/gflags.h
index 02b40e158dc..d5401f4f575 100644
--- a/extern/gflags/src/gflags/gflags.h
+++ b/extern/gflags/src/gflags/gflags.h
@@ -285,7 +285,11 @@ class GFLAGS_DLL_DECL FlagSaver {
FlagSaver(const FlagSaver&); // no copying!
void operator=(const FlagSaver&);
-}__attribute((unused));
+}
+#ifdef __GNUC__
+__attribute((unused))
+#endif
+;
// --------------------------------------------------------------------
// Some deprecated or hopefully-soon-to-be-deprecated functions.