aboutsummaryrefslogtreecommitdiffstats
path: root/ws_diag_control.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-02-17 11:36:52 -0800
committerGuy Harris <guy@alum.mit.edu>2018-02-17 19:37:23 +0000
commit86f2ff6ec027514d067fd6ec054b6b2fa7c3afe1 (patch)
tree34e570f0ec57770dcd419582939ac5f7cdac8d3b /ws_diag_control.h
parentcd443126a4d73612f27286b0f548a07b63553a5c (diff)
Yet Another Narrowing Warning to suppress.
Change-Id: I6ec0a04a0ad074849f447164270a7ff4851b698f Reviewed-on: https://code.wireshark.org/review/25839 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ws_diag_control.h')
-rw-r--r--ws_diag_control.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/ws_diag_control.h b/ws_diag_control.h
index e3ee28ed9c..006794ee20 100644
--- a/ws_diag_control.h
+++ b/ws_diag_control.h
@@ -91,8 +91,8 @@ extern "C" {
#endif
/*
- * Suppress complaints about conversion of size_t to int and about
- * signed vs. unsigned comparison.
+ * Suppress complaints about narrowing converstions and about signed vs.
+ * unsigned comparison.
*
* XXX - this is done solely to squelch complaints from code generated
* by Flex, but newer versions of Flex might fix the code; can we
@@ -104,11 +104,13 @@ extern "C" {
* Suppress:
*
* warning C4018: signed/unsigned mismatch
+ * warning C4244: 'initializing' : conversion from '__int64' to 'int', possible loss of data
* warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
*/
#define DIAG_OFF_FLEX \
__pragma(warning(push)) \
__pragma(warning(disable:4018)) \
+ __pragma(warning(disable:4244)) \
__pragma(warning(disable:4267))
#define DIAG_ON_FLEX __pragma(warning(pop))
#else