windows: fix more signedness warnings

diff --git a/src/build_test.cc b/src/build_test.cc
index 75be860..d55cae3 100644 (file)
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -280,7 +280,7 @@ TEST_F(BuildTest, NoWork) {
   string err;
   EXPECT_TRUE(builder_.Build(&err));
   EXPECT_EQ("no work to do", err);
-  EXPECT_EQ(0, commands_ran_.size());
+  EXPECT_EQ(0u, commands_ran_.size());
 }
 
 TEST_F(BuildTest, OneStep) {
@@ -293,7 +293,7 @@ TEST_F(BuildTest, OneStep) {
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
 
-  ASSERT_EQ(1, commands_ran_.size());
+  ASSERT_EQ(1u, commands_ran_.size());
   EXPECT_EQ("cat in1 > cat1", commands_ran_[0]);
 }
 
@@ -307,7 +307,7 @@ TEST_F(BuildTest, OneStep2) {
   EXPECT_TRUE(builder_.Build(&err));
   EXPECT_EQ("", err);
 
-  ASSERT_EQ(1, commands_ran_.size());
+  ASSERT_EQ(1u, commands_ran_.size());
   EXPECT_EQ("cat in1 > cat1", commands_ran_[0]);
 }
 
@@ -317,7 +317,7 @@ TEST_F(BuildTest, TwoStep) {
   ASSERT_EQ("", err);
   EXPECT_TRUE(builder_.Build(&err));
   EXPECT_EQ("", err);
-  ASSERT_EQ(3, commands_ran_.size());
+  ASSERT_EQ(3u, commands_ran_.size());
   // Depending on how the pointers work out, we could've ran
   // the first two commands in either order.
   EXPECT_TRUE((commands_ran_[0] == "cat in1 > cat1" &&
@@ -335,7 +335,7 @@ TEST_F(BuildTest, TwoStep) {
   ASSERT_EQ("", err);
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(5, commands_ran_.size());
+  ASSERT_EQ(5u, commands_ran_.size());
   EXPECT_EQ("cat in1 in2 > cat2", commands_ran_[3]);
   EXPECT_EQ("cat cat1 cat2 > cat12", commands_ran_[4]);
 }
@@ -354,14 +354,14 @@ TEST_F(BuildTest, Chain) {
   ASSERT_EQ("", err);
   EXPECT_TRUE(builder_.Build(&err));
   EXPECT_EQ("", err);
-  ASSERT_EQ(4, commands_ran_.size());
+  ASSERT_EQ(4u, commands_ran_.size());
 
   err.clear();
   commands_ran_.clear();
   EXPECT_FALSE(builder_.AddTarget("c5", &err));
   ASSERT_EQ("", err);
   EXPECT_TRUE(builder_.Build(&err));
-  ASSERT_EQ(0, commands_ran_.size());
+  ASSERT_EQ(0u, commands_ran_.size());
 
   GetNode("c4")->dirty_ = true;
   GetNode("c5")->dirty_ = true;
@@ -370,7 +370,7 @@ TEST_F(BuildTest, Chain) {
   EXPECT_TRUE(builder_.AddTarget("c5", &err));
   ASSERT_EQ("", err);
   EXPECT_TRUE(builder_.Build(&err));
-  ASSERT_EQ(2, commands_ran_.size());  // 3->4, 4->5
+  ASSERT_EQ(2u, commands_ran_.size());  // 3->4, 4->5
 }
 
 TEST_F(BuildTest, MissingInput) {
@@ -399,7 +399,7 @@ TEST_F(BuildTest, MakeDirs) {
   now_ = 0;  // Make all stat()s return file not found.
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(2, fs_.directories_made_.size());
+  ASSERT_EQ(2u, fs_.directories_made_.size());
   EXPECT_EQ("subdir", fs_.directories_made_[0]);
   EXPECT_EQ("subdir/dir2", fs_.directories_made_[1]);
 }
@@ -413,7 +413,7 @@ TEST_F(BuildTest, DepFileMissing) {
 
   EXPECT_TRUE(builder_.AddTarget("foo.o", &err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(1, fs_.files_read_.size());
+  ASSERT_EQ(1u, fs_.files_read_.size());
   EXPECT_EQ("foo.o.d", fs_.files_read_[0]);
 }
 
@@ -428,13 +428,13 @@ TEST_F(BuildTest, DepFileOK) {
   fs_.Create("foo.o.d", now_, "foo.o: blah.h bar.h\n");
   EXPECT_TRUE(builder_.AddTarget("foo.o", &err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(1, fs_.files_read_.size());
+  ASSERT_EQ(1u, fs_.files_read_.size());
   EXPECT_EQ("foo.o.d", fs_.files_read_[0]);
 
   // Expect our edge to now have three inputs: foo.c and two headers.
-  ASSERT_EQ(orig_edges + 1, state_.edges_.size());
+  ASSERT_EQ(orig_edges + 1, (int)state_.edges_.size());
   Edge* edge = state_.edges_.back();
-  ASSERT_EQ(3, edge->inputs_.size());
+  ASSERT_EQ(3u, edge->inputs_.size());
 
   // Expect the command line we generate to only use the original input.
   ASSERT_EQ("cc foo.c", edge->EvaluateCommand());
@@ -464,7 +464,7 @@ TEST_F(BuildTest, OrderOnlyDeps) {
 
   Edge* edge = state_.edges_.back();
   // One explicit, two implicit, one order only.
-  ASSERT_EQ(4, edge->inputs_.size());
+  ASSERT_EQ(4u, edge->inputs_.size());
   EXPECT_EQ(2, edge->implicit_deps_);
   EXPECT_EQ(1, edge->order_only_deps_);
   // Verify the inputs are in the order we expect
@@ -480,7 +480,7 @@ TEST_F(BuildTest, OrderOnlyDeps) {
   // explicit dep dirty, expect a rebuild.
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(1, commands_ran_.size());
+  ASSERT_EQ(1u, commands_ran_.size());
 
   // implicit dep dirty, expect a rebuild.
   commands_ran_.clear();
@@ -488,7 +488,7 @@ TEST_F(BuildTest, OrderOnlyDeps) {
   EXPECT_TRUE(builder_.AddTarget("foo.o", &err));
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(1, commands_ran_.size());
+  ASSERT_EQ(1u, commands_ran_.size());
 
   // order only dep dirty, no rebuild.
   commands_ran_.clear();
@@ -511,7 +511,7 @@ TEST_F(BuildTest, Phony) {
   // Only one command to run, because phony runs no command.
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_EQ("", err);
-  ASSERT_EQ(1, commands_ran_.size());
+  ASSERT_EQ(1u, commands_ran_.size());
 
   EXPECT_TRUE(builder_.Build(&err));
   ASSERT_NE("", err);

diff --git a/src/clean_test.cc b/src/clean_test.cc
index f5908b8..f031dee 100644 (file)
--- a/src/clean_test.cc
+++ b/src/clean_test.cc
@@ -41,7 +41,7 @@ TEST_F(CleanTest, CleanAll) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   EXPECT_EQ(0, cleaner.CleanAll());
   EXPECT_EQ(4, cleaner.cleaned_files_count());
-  EXPECT_EQ(4, fs_.files_removed_.size());
+  EXPECT_EQ(4u, fs_.files_removed_.size());
 
   // Check they are removed.
   EXPECT_EQ(0, fs_.Stat("in1"));
@@ -52,7 +52,7 @@ TEST_F(CleanTest, CleanAll) {
 
   EXPECT_EQ(0, cleaner.CleanAll());
   EXPECT_EQ(0, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanAllDryRun) {
@@ -72,7 +72,7 @@ TEST_F(CleanTest, CleanAllDryRun) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   EXPECT_EQ(0, cleaner.CleanAll());
   EXPECT_EQ(4, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 
   // Check they are not removed.
   EXPECT_NE(0, fs_.Stat("in1"));
@@ -83,7 +83,7 @@ TEST_F(CleanTest, CleanAllDryRun) {
 
   EXPECT_EQ(0, cleaner.CleanAll());
   EXPECT_EQ(4, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanTarget) {
@@ -102,7 +102,7 @@ TEST_F(CleanTest, CleanTarget) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   ASSERT_EQ(0, cleaner.CleanTarget("out1"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(2, fs_.files_removed_.size());
+  EXPECT_EQ(2u, fs_.files_removed_.size());
 
   // Check they are removed.
   EXPECT_EQ(0, fs_.Stat("in1"));
@@ -113,7 +113,7 @@ TEST_F(CleanTest, CleanTarget) {
 
   ASSERT_EQ(0, cleaner.CleanTarget("out1"));
   EXPECT_EQ(0, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanTargetDryRun) {
@@ -133,7 +133,7 @@ TEST_F(CleanTest, CleanTargetDryRun) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   ASSERT_EQ(0, cleaner.CleanTarget("out1"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 
   // Check they are removed.
   EXPECT_NE(0, fs_.Stat("in1"));
@@ -144,7 +144,7 @@ TEST_F(CleanTest, CleanTargetDryRun) {
 
   ASSERT_EQ(0, cleaner.CleanTarget("out1"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanRule) {
@@ -165,7 +165,7 @@ TEST_F(CleanTest, CleanRule) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   ASSERT_EQ(0, cleaner.CleanRule("cat_e"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(2, fs_.files_removed_.size());
+  EXPECT_EQ(2u, fs_.files_removed_.size());
 
   // Check they are removed.
   EXPECT_EQ(0, fs_.Stat("in1"));
@@ -176,7 +176,7 @@ TEST_F(CleanTest, CleanRule) {
 
   ASSERT_EQ(0, cleaner.CleanRule("cat_e"));
   EXPECT_EQ(0, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanRuleDryRun) {
@@ -198,7 +198,7 @@ TEST_F(CleanTest, CleanRuleDryRun) {
   ASSERT_EQ(0, cleaner.cleaned_files_count());
   ASSERT_EQ(0, cleaner.CleanRule("cat_e"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 
   // Check they are removed.
   EXPECT_NE(0, fs_.Stat("in1"));
@@ -209,7 +209,7 @@ TEST_F(CleanTest, CleanRuleDryRun) {
 
   ASSERT_EQ(0, cleaner.CleanRule("cat_e"));
   EXPECT_EQ(2, cleaner.cleaned_files_count());
-  EXPECT_EQ(0, fs_.files_removed_.size());
+  EXPECT_EQ(0u, fs_.files_removed_.size());
 }
 
 TEST_F(CleanTest, CleanFailure) {

diff --git a/src/parsers_test.cc b/src/parsers_test.cc
index 9bd16a9..0ffd69e 100644 (file)
--- a/src/parsers_test.cc
+++ b/src/parsers_test.cc
@@ -58,7 +58,7 @@ TEST_F(ParserTest, Rules) {
 "\n"
 "build result: cat in_1.cc in-2.O\n"));
 
-  ASSERT_EQ(3, state.rules_.size());
+  ASSERT_EQ(3u, state.rules_.size());
   const Rule* rule = state.rules_.begin()->second;
   EXPECT_EQ("cat", rule->name_);
   EXPECT_EQ("cat $in > $out", rule->command_.unparsed());
@@ -78,7 +78,7 @@ TEST_F(ParserTest, Variables) {
 "build supernested: link x\n"
 "  extra = $nested2/3\n"));
 
-  ASSERT_EQ(2, state.edges_.size());
+  ASSERT_EQ(2u, state.edges_.size());
   Edge* edge = state.edges_[0];
   EXPECT_EQ("ld one-letter-test -pthread -under -o a b c",
             edge->EvaluateCommand());
@@ -101,7 +101,7 @@ TEST_F(ParserTest, VariableScope) {
 "\n"  // Extra newline after build line tickles a regression.
 ));
 
-  ASSERT_EQ(2, state.edges_.size());
+  ASSERT_EQ(2u, state.edges_.size());
   EXPECT_EQ("cmd baz a inner", state.edges_[0]->EvaluateCommand());
   EXPECT_EQ("cmd bar b outer", state.edges_[1]->EvaluateCommand());
 }
@@ -115,7 +115,7 @@ TEST_F(ParserTest, Continuation) {
 "build a: link c \\\n"
 " d e f\n"));
 
-  ASSERT_EQ(2, state.rules_.size());
+  ASSERT_EQ(2u, state.rules_.size());
   const Rule* rule = state.rules_.begin()->second;
   EXPECT_EQ("link", rule->name_);
   EXPECT_EQ("foo bar baz", rule->command_.unparsed());
@@ -322,14 +322,14 @@ TEST_F(ParserTest, SubNinja) {
 "build $builddir/outer: varref\n"
 "subninja test.ninja\n"
 "build $builddir/outer2: varref\n"));
-  ASSERT_EQ(1, files_read_.size());
+  ASSERT_EQ(1u, files_read_.size());
 
   EXPECT_EQ("test.ninja", files_read_[0]);
   EXPECT_TRUE(state.LookupNode("some_dir/outer"));
   // Verify our builddir setting is inherited.
   EXPECT_TRUE(state.LookupNode("some_dir/inner"));
 
-  ASSERT_EQ(3, state.edges_.size());
+  ASSERT_EQ(3u, state.edges_.size());
   EXPECT_EQ("varref outer", state.edges_[0]->EvaluateCommand());
   EXPECT_EQ("varref inner", state.edges_[1]->EvaluateCommand());
   EXPECT_EQ("varref outer", state.edges_[2]->EvaluateCommand());
@@ -341,7 +341,7 @@ TEST_F(ParserTest, Include) {
 "var = outer\n"
 "include include.ninja\n"));
 
-  ASSERT_EQ(1, files_read_.size());
+  ASSERT_EQ(1u, files_read_.size());
   EXPECT_EQ("include.ninja", files_read_[0]);
   EXPECT_EQ("inner", state.bindings_.LookupVariable("var"));
 }