diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-07 12:38:03 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-07 12:38:03 +0300 |
commit | 6fee241db57892cbad0db14a1c18d1f494b5e21a (patch) | |
tree | 5d1ac98722a00acbd9b56bf2a07feb012f8e2e19 /source/blender | |
parent | ce18956d9bd1e4df8d5574df9f06c4e1bcde9b54 (diff) | |
parent | 29ace10f7e66e341713a079aab4cdac4efe45f52 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index 964ee06469d..86b7285655e 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -30,6 +30,8 @@ #ifdef __GNUC__ # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 /* gcc4.6+ only */ # pragma GCC diagnostic error "-Wsign-compare" +# endif +# if __GNUC__ >= 6 /* gcc6+ only */ # pragma GCC diagnostic error "-Wconversion" # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 |