summaryrefslogtreecommitdiffstats
path: root/rlz
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-02-19 15:17:04 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-19 23:18:14 +0000
commitd1c719acf7db459016f425eb8018ec4208511578 (patch)
treef5604ba0055245c0133cd5747e8a70de99b917f7 /rlz
parent9ff250e0023b2f87e0fddd7eadbef7be3ecc3882 (diff)
downloadchromium_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 'rlz')
-rw-r--r--rlz/BUILD.gn14
1 files changed, 6 insertions, 8 deletions
diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn
index f889137..9c44dad 100644
--- a/rlz/BUILD.gn
+++ b/rlz/BUILD.gn
@@ -55,6 +55,9 @@ source_set("rlz_lib") {
"win/lib/rlz_value_store_registry.h",
]
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
public_configs = [ ":rlz_config" ]
deps = [
@@ -73,9 +76,6 @@ source_set("rlz_lib") {
"mac/lib/rlz_value_store_mac.h",
]
set_sources_assignment_filter(sources_assignment_filter)
- } else if (is_win) {
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- cflags = [ "/wd4267" ]
}
}
@@ -106,6 +106,9 @@ test("rlz_unittests") {
"win/lib/machine_deal_test.cc",
]
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+ configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
deps = [
":rlz_lib",
":test_support",
@@ -116,11 +119,6 @@ test("rlz_unittests") {
"//testing/gtest",
"//third_party/zlib",
]
-
- if (is_win) {
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
- cflags = [ "/wd4267" ]
- }
}
executable("rlz_id") {