[Bf-blender-cvs] [29ace10f7e6] master: gcc5 has issues with Wconversion

[Dalai Felinto]

Commit: 29ace10f7e66e341713a079aab4cdac4efe45f52
Author: Dalai Felinto
Date:   Wed Jun 7 11:37:28 2017 +0200
Branches: master
https://developer.blender.org/rB29ace10f7e66e341713a079aab4cdac4efe45f52

gcc5 has issues with Wconversion

This leads to a crash in 2.8, but commiting here.
Patch by Campbell Barton.

===================================================================

M	source/blender/blenlib/BLI_strict_flags.h

===================================================================

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