From a2c55db304b64f3c05f1ea4bdc19942f8681ce0e Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Wed, 23 Mar 2016 22:26:04 -0700 Subject: [PATCH] Bug 1124033 - Disable C4312 in dom/plugins/ipc; r=ehsan This was in a previously reviewed patch. I dropped the change because I thought the underlying warning had been fixed. I was wrong. MozReview-Commit-ID: J9B34YhJ3z0 --HG-- extra : source : ea446df75d17331a7c0736ef3303bf9a07d8d9f0 --- dom/plugins/ipc/moz.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index dd94537de7d4..0a3b6ad51d37 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -152,3 +152,6 @@ if CONFIG['_MSC_VER']: # This is intended as a temporary hack to support building with VS2015. # conversion from 'X' to 'Y' requires a narrowing conversion CXXFLAGS += ['-wd4838'] + + # 'type cast': conversion from 'unsigned int' to 'HIMC' of greater size + CXXFLAGS += ['-wd4312']