diff options
author | dcheng <dcheng@chromium.org> | 2015-06-30 20:22:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-01 03:22:58 +0000 |
commit | 700bce216cb9399ce306850ee66d3ce5a68c4cfa (patch) | |
tree | 4b7db38e6224ac5b2d9da917474ad07e2029b390 /cloud_print/service | |
parent | a7a4b78786a4ab52cd4995090f15278dd99fe850 (diff) | |
download | chromium_src-700bce216cb9399ce306850ee66d3ce5a68c4cfa.zip chromium_src-700bce216cb9399ce306850ee66d3ce5a68c4cfa.tar.gz chromium_src-700bce216cb9399ce306850ee66d3ce5a68c4cfa.tar.bz2 |
Add local suppresion for -Wparentheses and enable everywhere on Windows.
The Cloud Print Windows service uses WTL, and one of the headers uses
an assignment inside a conditional (atlgdi.h), which triggers this clang
warning.
BUG=505302
TBR=scottbyer@chromium.org,vitalybuka@chromium.org
Review URL: https://codereview.chromium.org/1214113010
Cr-Commit-Position: refs/heads/master@{#336964}
Diffstat (limited to 'cloud_print/service')
-rw-r--r-- | cloud_print/service/BUILD.gn | 4 | ||||
-rw-r--r-- | cloud_print/service/win/service.gyp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cloud_print/service/BUILD.gn b/cloud_print/service/BUILD.gn index df6d636..7baf63b 100644 --- a/cloud_print/service/BUILD.gn +++ b/cloud_print/service/BUILD.gn @@ -39,6 +39,10 @@ source_set("cloud_print_service_lib") { "//net", "//url", ] + + if (is_clang) { + cflags = [ "-Wno-parentheses" ] + } } grit("service_resources") { diff --git a/cloud_print/service/win/service.gyp b/cloud_print/service/win/service.gyp index 1221842..a00c5d3 100644 --- a/cloud_print/service/win/service.gyp +++ b/cloud_print/service/win/service.gyp @@ -80,11 +80,15 @@ }, 'conditions': [ ['clang==1', { - # atlapp.h contains a global "using namespace WTL;". # TODO: Remove once cloud_print_service_config.cc no longer depends # on atlapp.h, http://crbug.com/5027 'VCCLCompilerTool': { - 'AdditionalOptions': ['-Wno-header-hygiene'], + 'AdditionalOptions': [ + # atlapp.h contains a global "using namespace WTL;". + '-Wno-header-hygiene', + # atlgdi.h does an intentional assignment in an if conditional. + '-Wno-parentheses', + ], }, }], ], |