Fix Clang and VC warnings

4 files changed, 16 insertions, 5 deletions

diff --git a/build2/bin/target b/build2/bin/target
index 0a324a5..caf96f4 100644
--- a/build2/bin/target
+++ b/build2/bin/target
@@ -105,7 +105,11 @@ namespace build2
 
     public:
       static const target_type static_type;
-      virtual const target_type& dynamic_type () const {return static_type;}
+
+      virtual const target_type& dynamic_type () const override
+      {
+        return static_type;
+      }
     };
 
     // Windows import library.
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 29f7a37..b071cf3 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -526,7 +526,11 @@ namespace build2
             // stderr (if cached), print the proper diagnostics and fail.
             //
             optional<process::status_type> status (move (pr.status));
-            bool valid_status (status && *status >= 0 && *status < 256);
+
+            // Comparison *status >= 0 causes "always true" warning on Windows
+            // where process::status_type is defined as uint32_t.
+            //
+            bool valid_status (status && *status + 1 > 0 && *status < 256);
             bool eq (c.exit.comparison == exit_comparison::eq);
 
             bool correct_status (valid_status &&
diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx
index e453d44..2679cb7 100644
--- a/build2/test/script/script.cxx
+++ b/build2/test/script/script.cxx
@@ -433,7 +433,7 @@ namespace build2
           if (const value* v = p->vars.find (var))
             return lookup (v, &p->vars);
         }
-        while (p->parent != nullptr ? (p = p->parent) : nullptr);
+        while ((p->parent != nullptr ? (p = p->parent) : nullptr) != nullptr);
 
         // Switch to the corresponding buildfile variable. Note that we don't
         // want to insert a new variable into the pool (we might be running
diff --git a/tests/test/script/runner/driver.cxx b/tests/test/script/runner/driver.cxx
index 10d5857..a82b083 100644
--- a/tests/test/script/runner/driver.cxx
+++ b/tests/test/script/runner/driver.cxx
@@ -38,17 +38,20 @@ main (int argc, char* argv[])
 
     auto toi = [] (const string& s) -> int
     {
+      int r (-1);
+
       try
       {
         size_t n;
-        int r (stoi (s, &n));
+        r = stoi (s, &n);
         assert (n == s.size ());
-        return r;
       }
       catch (const exception&)
       {
         assert (false);
       }
+
+      return r;
     };
 
     if (o == "-i")