ifdef'd gcc diagnostic pragma's to quiet msvc and others.

This commit is contained in:
Campbell Barton 2012-11-23 10:03:50 +00:00
parent 83169542c5
commit 1b32f258e7
6 changed files with 27 additions and 11 deletions

@ -198,8 +198,10 @@ static void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3
w3[0] = 1.0f - w1[0] - w2[0];
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdouble-promotion"
#ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
DO_INLINE void collision_interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 )
{
@ -371,7 +373,9 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM
return result;
}
#pragma GCC diagnostic pop
#ifdef __GNUC__
# pragma GCC diagnostic pop
#endif
//Determines collisions on overlap, collisions are written to collpair[i] and collision+number_collision_found is returned
static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,

@ -86,11 +86,13 @@
#include "RE_shader_ext.h"
#ifdef _OPENMP
#include <omp.h>
# include <omp.h>
#endif
/* could enable at some point but for now there are far too many conversions */
#pragma GCC diagnostic ignored "-Wdouble-promotion"
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
/* precalculated gaussian factors for 5x super sampling */
static float gaussianFactors[5] = {0.996849f,

@ -233,8 +233,10 @@ static int isqtime(const char *name)
#endif
/* BLI_vsnprintf in ffmpeg_log_callback() causes invalid warning */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
#ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wmissing-format-attribute"
#endif
static char ffmpeg_last_error[1024];
@ -258,7 +260,9 @@ static void ffmpeg_log_callback(void *ptr, int level, const char *format, va_lis
}
}
#pragma GCC diagnostic pop
#ifdef __GNUC__
# pragma GCC diagnostic pop
#endif
void IMB_ffmpeg_init(void)
{

@ -125,7 +125,9 @@
#define FLT_EPSILON10 1.19209290e-06F
/* could enable at some point but for now there are far too many conversions */
#pragma GCC diagnostic ignored "-Wdouble-promotion"
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
/* ------------------------------------------------------------------------- */

@ -58,7 +58,9 @@
#include "shading.h" /* own include */
/* could enable at some point but for now there are far too many conversions */
#pragma GCC diagnostic ignored "-Wdouble-promotion"
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */

@ -77,7 +77,9 @@
#include "zbuf.h"
/* could enable at some point but for now there are far too many conversions */
#pragma GCC diagnostic ignored "-Wdouble-promotion"
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wdouble-promotion"
#endif
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* defined in pipeline.c, is hardcopy of active dynamic allocated Render */