diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | source/blender/blenkernel/intern/mask_rasterize.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_strict_flags.h | 9 |
3 files changed, 27 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6836121fdc3..b022233becb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1001,7 +1001,23 @@ elseif(WIN32) set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi /MP" CACHE STRING "MSVC MT flags " FORCE) # most msvc warnings are C & C++ - set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013 /wd4200") + set(_WARNINGS + # warning level: + "/W3" + # disable: + "/wd4018" # signed/unsigned mismatch + "/wd4065" # switch statement contains 'default' but no 'case' labels + "/wd4181" # qualifier applied to reference type; ignored + "/wd4200" # zero-sized array in struct/union + "/wd4244" # conversion from 'type1' to 'type2', possible loss of data + "/wd4267" # conversion from 'size_t' to 'type', possible loss of data + "/wd4305" # truncation from 'type1' to 'type2' + "/wd4800" # forcing value to bool 'true' or 'false' + # errors: + "/we4013" # 'function' undefined; assuming extern returning int + ) + + string(REPLACE ";" " " _WARNINGS "${_WARNINGS}") set(C_WARNINGS "${_WARNINGS}") set(CXX_WARNINGS "${_WARNINGS}") unset(_WARNINGS) diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 2c60f52578d..ba1b873c613 100644..100755 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1440,7 +1440,7 @@ void BKE_maskrasterize_buffer(MaskRasterHandle *mr_handle, #endif #pragma omp parallel for private(y) - for (y = 0; y < height; y++) { + for (y = 0; (unsigned int)y < height; y++) { unsigned int i = y * width; unsigned int x; float xy[2]; diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h index 5c5a6f45f0c..cb92f7837ec 100644 --- a/source/blender/blenlib/BLI_strict_flags.h +++ b/source/blender/blenlib/BLI_strict_flags.h @@ -38,4 +38,13 @@ # endif #endif +#ifdef _MSC_VER +# pragma warning(error:4018) /* signed/unsigned mismatch */ +# pragma warning(error:4244) /* conversion from 'type1' to 'type2', possible loss of data */ +# pragma warning(error:4245) /* conversion from 'int' to 'unsigned int' */ +# pragma warning(error:4267) /* conversion from 'size_t' to 'type', possible loss of data */ +# pragma warning(error:4305) /* truncation from 'type1' to 'type2' */ +# pragma warning(error:4389) /* signed/unsigned mismatch */ +#endif + #endif /* __BLI_STRICT_FLAGS_H__ */ |