Mesa (master): glsl: Disable MSVC switch warning on a per-file basis.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sun Mar 22 08:23:36 UTC 2015


Module: Mesa
Branch: master
Commit: fb78cccd7b5c29f9ecd2c86b530449e903dcc093
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb78cccd7b5c29f9ecd2c86b530449e903dcc093

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Thu Mar 19 22:24:20 2015 +0000

glsl: Disable MSVC switch warning on a per-file basis.

This addresses

  ...\glsl_parser.cpp(...) : warning C4065: switch statement contains 'default' but no 'case' labels

This is on code generated by bison, which we have little control.

It seems useful to have this warning otherwise enabled.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/glsl_parser.yy |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index 90c216e..aceb3b9 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -34,6 +34,10 @@
 #include "glsl_types.h"
 #include "main/context.h"
 
+#ifdef _MSC_VER
+#pragma warning( disable : 4065 ) // switch statement contains 'default' but no 'case' labels
+#endif
+
 #undef yyerror
 
 static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)




More information about the mesa-commit mailing list