diff options
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 7 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_mempool.c | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bisect_plane.c | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 8fa9cb90c8e..e8102d98345 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -37,9 +37,6 @@ #include <stdarg.h> #include <sys/types.h> -/* to ensure strict conversions */ -#include "../../source/blender/blenlib/BLI_strict_flags.h" - /* mmap exception */ #if defined(WIN32) # include "mmap_win.h" @@ -59,6 +56,10 @@ #include "MEM_guardedalloc.h" +/* to ensure strict conversions */ +#include "../../source/blender/blenlib/BLI_strict_flags.h" + + /* should always be defined except for experimental cases */ #ifdef WITH_GUARDEDALLOC diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index 18d899e5702..5c5a6f45f0c 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -31,9 +31,7 @@ # pragma GCC diagnostic error "-Wsign-conversion" # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406 /* gcc4.6+ only */ # pragma GCC diagnostic error "-Wsign-compare" -# ifndef __APPLE__ /* gcc4.6+ on Apple would fail in stdio.h */ -# pragma GCC diagnostic error "-Wconversion" -# endif +# pragma GCC diagnostic error "-Wconversion" # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 408 /* gcc4.8+ only (behavior changed to ignore globals)*/ # pragma GCC diagnostic error "-Wshadow" diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c index feeda151b5b..febf09745fb 100644 --- a/source/blender/blenlib/intern/BLI_mempool.c +++ b/source/blender/blenlib/intern/BLI_mempool.c @@ -36,7 +36,6 @@ #include "BLI_utildefines.h" #include "BLI_listbase.h" -#include "BLI_strict_flags.h" #include "BLI_mempool.h" /* own include */ @@ -44,6 +43,9 @@ #include "MEM_guardedalloc.h" +#include "BLI_strict_flags.h" /* keep last */ + + /* note: copied from BLO_blend_defs.h, don't use here because we're in BLI */ #ifdef __BIG_ENDIAN__ /* Big Endian */ diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index bfe710d9fdd..3baf8675a0d 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -43,11 +43,12 @@ #include "BLI_linklist.h" #include "BLI_linklist_stack.h" #include "BLI_math.h" -#include "BLI_strict_flags.h" #include "bmesh.h" #include "bmesh_bisect_plane.h" /* own include */ +#include "BLI_strict_flags.h" /* keep last */ + /* -------------------------------------------------------------------- */ /* Math utils */ |