diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-07 12:37:28 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-07 12:37:28 +0300 |
commit | 29ace10f7e66e341713a079aab4cdac4efe45f52 (patch) | |
tree | 7f220cd42367181e042abfc852acb1ff8efca424 /source/blender | |
parent | 58a434b37256766a73ecda79f7620632f2183fb8 (diff) |
gcc5 has issues with Wconversion
This leads to a crash in 2.8, but commiting here.
Patch by Campbell Barton.
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 |