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:
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.