summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Harris <wfh@chromium.org>2018-08-29 23:28:23 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-29 23:28:23 +0000
commitb6dbcb211b1ecca9aea7afb70de27d216af15ec9 (patch)
tree1d176ae10de1bcc4999d1ca9c3171f4dbc171bd7
parentd5f427901b52e1311ab51f16e87459ec34691591 (diff)
downloadpdfium-b6dbcb211b1ecca9aea7afb70de27d216af15ec9.tar.xz
Change explicit suppression of warning 4267 to a config based suppression.
Remove two unneeded suppressions from pdfium's skia, as these are already covered by the //build/config/compiler:no_chromium_code config. BUG=588506 Change-Id: I347f2c98c6fd13679660fb25df2d2141e9b56e55 Reviewed-on: https://pdfium-review.googlesource.com/41611 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
-rw-r--r--BUILD.gn2
-rw-r--r--skia/BUILD.gn3
2 files changed, 1 insertions, 4 deletions
diff --git a/BUILD.gn b/BUILD.gn
index e3ba58cf02..27e4b2615a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -85,11 +85,11 @@ config("pdfium_core_config") {
}
if (is_win) {
cflags += [
- "/wd4267",
"/wd4324",
"/wd4577",
]
}
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
}
config("xfa_warnings") {
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 1612f17f6e..7851b35101 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -167,15 +167,12 @@ config("skia_library_config") {
cflags = [
"/wd4244", # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
- "/wd4267", # conversion from 'size_t' (64 bit) to 'type'(32 bit).
"/wd4341", # signed value is out of range for enum constant.
"/wd4345", # Object is default-initialized if initialization is omitted.
"/wd4390", # ';'empty statement found in looping;is it what was intended?
"/wd4554", # 'operator' : check operator precedence for possible error
"/wd4748", # compiler will disable optimizations if a function has inline
# assembly code contains flow control(jmp or jcc) statements.
-
- "/wd4800", # forcing value to bool 'true/false'(assigning int to bool).
]
}
}