summaryrefslogtreecommitdiffstats
path: root/src/util_test.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-08-10 20:39:25 (GMT)
committerEvan Martin <martine@danga.com>2012-08-10 20:44:43 (GMT)
commit09775f02209a07a4e1032b9ab9d8ce5f0ff8d583 (patch)
tree2955ace975992b8468596feb05425be12e6ba26a /src/util_test.cc
parentd58a10965610eb6b338e411ce816b810d76ab59e (diff)
downloadNinja-09775f02209a07a4e1032b9ab9d8ce5f0ff8d583.zip
Ninja-09775f02209a07a4e1032b9ab9d8ce5f0ff8d583.tar.gz
Ninja-09775f02209a07a4e1032b9ab9d8ce5f0ff8d583.tar.bz2
windows: fix integer truncation issues for helper binaries
Disable the size_t truncation warning. (Note that this leaves on the other truncation-related warnings, like int->char.)
Diffstat (limited to 'src/util_test.cc')
-rw-r--r--src/util_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util_test.cc b/src/util_test.cc
index 5ace5e7..7a34671 100644
--- a/src/util_test.cc
+++ b/src/util_test.cc
@@ -105,18 +105,18 @@ TEST(CanonicalizePath, AbsolutePath) {
TEST(CanonicalizePath, NotNullTerminated) {
string path;
string err;
- int len;
+ size_t len;
path = "foo/. bar/.";
len = strlen("foo/."); // Canonicalize only the part before the space.
EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err));
- EXPECT_EQ(strlen("foo"), static_cast<size_t>(len));
+ EXPECT_EQ(strlen("foo"), len);
EXPECT_EQ("foo/. bar/.", string(path));
path = "foo/../file bar/.";
len = strlen("foo/../file");
EXPECT_TRUE(CanonicalizePath(&path[0], &len, &err));
- EXPECT_EQ(strlen("file"), static_cast<size_t>(len));
+ EXPECT_EQ(strlen("file"), len);
EXPECT_EQ("file ./file bar/.", string(path));
}