diff options
| author | brettw <brettw@chromium.org> | 2015-02-19 15:17:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 23:18:14 +0000 |
| commit | d1c719acf7db459016f425eb8018ec4208511578 (patch) | |
| tree | f5604ba0055245c0133cd5747e8a70de99b917f7 /ui/views | |
| parent | 9ff250e0023b2f87e0fddd7eadbef7be3ecc3882 (diff) | |
| download | chromium_src-d1c719acf7db459016f425eb8018ec4208511578.zip chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.gz chromium_src-d1c719acf7db459016f425eb8018ec4208511578.tar.bz2 | |
Update existing uses of /wd4267 to use the GN config
This is the size_t to integer conversion warning. Using the config prevents flag duplication and is clearer to read.
Minor updates to Win64 build, including some fixes for size_t to int conversions.
Review URL: https://codereview.chromium.org/929793006
Cr-Commit-Position: refs/heads/master@{#317162}
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/BUILD.gn | 4 | ||||
| -rw-r--r-- | ui/views/examples/BUILD.gn | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index 726288c..be6c0da 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -14,6 +14,9 @@ gypi_values = exec_script("//build/gypi_to_gn.py", component("views") { sources = gypi_values.views_sources + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "VIEWS_IMPLEMENTATION" ] deps = [ @@ -67,7 +70,6 @@ component("views") { if (is_win) { sources += gypi_values.views_win_sources - cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. libs = [ "imm32.lib", "oleacc.lib", diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn index c4289d8..455b06c 100644 --- a/ui/views/examples/BUILD.gn +++ b/ui/views/examples/BUILD.gn @@ -61,6 +61,9 @@ component("views_examples_lib") { "widget_example.h", ] + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + defines = [ "VIEWS_EXAMPLES_IMPLEMENTATION" ] deps = [ @@ -78,9 +81,6 @@ component("views_examples_lib") { if (is_win) { deps += [ "//third_party/wtl" ] - - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - cflags = [ "/wd4267" ] } if (use_aura) { |