win: avoid warnings in string_number_conversion_test.cc

util/stdlib/string_number_conversion_test.cc

Index: util/stdlib/string_number_conversion_test.cc
diff --git a/util/stdlib/string_number_conversion_test.cc b/util/stdlib/string_number_conversion_test.cc
index ec0d44ae301dd267381923ce819a03649279d751..85db92ffc911efe138cd165958dc69a506c2c31f 100644
--- a/util/stdlib/string_number_conversion_test.cc
+++ b/util/stdlib/string_number_conversion_test.cc
@@ -53,7 +53,15 @@ TEST(StringNumberConversion, StringToInt) {
       {"0x80000000", false, 0},
       {"0xFFFFFFFF", false, 0},
       {"-0x7fffffff", true, -2147483647},
+#if defined(COMPILER_MSVC)

[Mark Mentovai, 2014/12/16 14:17:47]

build/build_config.h for this if it’s still necessary—see the next comment.

+#pragma warning(push)
+// Unary minus applied to unsigned type, result still unsigned.
+#pragma warning(disable: 4146)
+#endif
       {"-0x80000000", true, -2147483648},

[Mark Mentovai, 2014/12/16 14:17:47]

Would static_cast<>() also silence the warning? I think that’d be preferable.

[scottmg, 2014/12/16 17:53:56]

Cast inside i.e. -static_cast<int>(2147483648) avoids the warning but looks a
little strange.

... It's going to be 0x80000000 regardless of -, perhaps just writing that?

+#if defined(COMPILER_MSVC)
+#pragma warning(pop)
+#endif
       {"-0x80000001", false, 0},
       {"-0xffffffff", false, 0},
       {"0x100000000", false, 0},
@@ -108,8 +116,10 @@ TEST(StringNumberConversion, StringToInt) {
     }
   }
 
-  // Ensure that embedded NUL characters are treated as bad input.
-  const char input[] = "6\0006";
+  // Ensure that embedded NUL characters are treated as bad input. The string
+  // is split to avoid MSVC warning:
+  //   "decimal digit terminates octal escape sequence".
+  const char input[] = "6\000" "6";
   base::StringPiece input_string(input, arraysize(input) - 1);
   int output;
   EXPECT_FALSE(StringToNumber(input_string, &output));
@@ -205,7 +215,7 @@ TEST(StringNumberConversion, StringToUnsignedInt) {
   }
 
   // Ensure that embedded NUL characters are treated as bad input.

[Mark Mentovai, 2014/12/16 14:17:47]

The existing comment was duplicated from above, so your note about splitting the
string should be too.

[scottmg, 2014/12/16 17:53:56]

Done.

-  const char input[] = "6\0006";
+  const char input[] = "6\000" "6";
   base::StringPiece input_string(input, arraysize(input) - 1);
   unsigned int output;
   EXPECT_FALSE(StringToNumber(input_string, &output));