diff options
| author | thakis <thakis@chromium.org> | 2014-11-03 12:07:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-03 20:07:37 +0000 |
| commit | 4c11a965b4484a9f339491b70b2860a3c5b2f135 (patch) | |
| tree | 6167729c92345b653f05e26e76a7922e645988da /cloud_print | |
| parent | fa4afa9c8737114462d305adfa1def3f000318dd (diff) | |
| download | chromium_src-4c11a965b4484a9f339491b70b2860a3c5b2f135.zip chromium_src-4c11a965b4484a9f339491b70b2860a3c5b2f135.tar.gz chromium_src-4c11a965b4484a9f339491b70b2860a3c5b2f135.tar.bz2 | |
clang/win: Disable -Wwritable-strings for most cloud_print service targets.
Suppresses 4 warnings that look like
In file included from ..\..\cloud_print\service\win\cloud_print_service.cc:32:
..\..\cloud_print/service/win/service_controller.h(28,3) : warning(clang): ISO C++11 does not allow conversion from string literal to 'TCHAR *' (aka 'wchar_t *') [-Wwritable-strings]
DECLARE_REGISTRY_APPID_RESOURCEID(IDR_CLOUDPRINTSERVICE,
^
C:\b\depot_tools\win_toolchain\vs2013_files/VC/atlmfc/include\atlbase.h(3086,10) : note(clang): expanded from macro 'DECLARE_REGISTRY_APPID_RESOURCEID'
return _T(appid); \
^
C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\tchar.h(2498,21) : note(clang): expanded from macro '_T'
^
C:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\tchar.h(206,21) : note(clang): expanded from macro '__T'
^
<scratch space>(20,1) : note(clang): expanded from here
L"{8013FB7C-2E3E-4992-B8BD-05C0C4AB0627}"
^
1 warning generated.
BUG=82385
Review URL: https://codereview.chromium.org/686683004
Cr-Commit-Position: refs/heads/master@{#302471}
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/service/service.gyp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp index afc1e8f..6fd20b8 100644 --- a/cloud_print/service/service.gyp +++ b/cloud_print/service/service.gyp @@ -69,6 +69,25 @@ '<(DEPTH)/chrome/common_constants.gyp:common_constants', ], }], + ['OS=="win" and clang==1', { + # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which + # in msvs2013 returns string literals via a non-const pointer. So + # disable this warning for now. + # TODO(thakis): Remove this once we're on 2014, + # https://connect.microsoft.com/VisualStudio/feedback/details/806376/atl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013 + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': ['-Wno-writable-strings'], + }, + }, + 'direct_dependent_settings': { + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': ['-Wno-writable-strings'], + }, + }, + }, + }], ['enable_printing!=0', { 'dependencies': [ '<(DEPTH)/printing/printing.gyp:printing', |