[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59711] trunk/blender/source/blender/ blenlib/BLI_strict_flags.h: OSX/gcc4.6+: fix compiling, -Wconversion causes ann weeror in gcc's own stdio.h else

jens verwiebe info at jensverwiebe.de
Sun Sep 1 17:03:44 CEST 2013


Revision: 59711
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59711
Author:   jensverwiebe
Date:     2013-09-01 15:03:44 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
OSX/gcc4.6+: fix compiling, -Wconversion causes ann weeror in gcc's own stdio.h else

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_strict_flags.h

Modified: trunk/blender/source/blender/blenlib/BLI_strict_flags.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_strict_flags.h	2013-09-01 15:01:15 UTC (rev 59710)
+++ trunk/blender/source/blender/blenlib/BLI_strict_flags.h	2013-09-01 15:03:44 UTC (rev 59711)
@@ -31,7 +31,9 @@
 #  pragma GCC diagnostic error "-Wsign-conversion"
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406  /* gcc4.6+ only */
 #    pragma GCC diagnostic error "-Wsign-compare"
-#    pragma GCC diagnostic error "-Wconversion"
+#      ifndef __APPLE__ /* gcc4.6+ on Apple would fail in stdio.h */
+#        pragma GCC diagnostic error "-Wconversion"
+#      endif
 #  endif
 #  if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408  /* gcc4.8+ only (behavior changed to ignore globals)*/
 #    pragma GCC diagnostic error "-Wshadow"




More information about the Bf-blender-cvs mailing list