diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 07:03:39 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 07:03:39 +0000 |
commit | ed8e57da499e4ad0398f78696c3b2dfaa66ceaba (patch) | |
tree | eb8d06a0dc4d45d7aedf8822d62711e49f9acb9a /base/strings/string_util_unittest.cc | |
parent | 7a70d2211a276c2b675d07319d1393b43059f8f6 (diff) | |
download | chromium_src-ed8e57da499e4ad0398f78696c3b2dfaa66ceaba.zip chromium_src-ed8e57da499e4ad0398f78696c3b2dfaa66ceaba.tar.gz chromium_src-ed8e57da499e4ad0398f78696c3b2dfaa66ceaba.tar.bz2 |
Fixes for re-enabling more MSVC level 4 warnings: base/ edition
This contains fixes for the following sorts of issues:
* Signedness mismatch
* Assignment inside conditional
* Nonstandard extension: unnamed struct/union
* Octal escape sequence terminated by decimal number
* Possibly-uninitialized local variable
This also contains a very small number of other cleanups/simplifications to
nearby code.
BUG=81439
TEST=none
Review URL: https://codereview.chromium.org/368133002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/strings/string_util_unittest.cc')
-rw-r--r-- | base/strings/string_util_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/strings/string_util_unittest.cc b/base/strings/string_util_unittest.cc index 4ea9069..0928c0f 100644 --- a/base/strings/string_util_unittest.cc +++ b/base/strings/string_util_unittest.cc @@ -57,7 +57,8 @@ static const struct trim_case_ascii { namespace { // Helper used to test TruncateUTF8ToByteSize. -bool Truncated(const std::string& input, const size_t byte_size, +bool Truncated(const std::string& input, + const size_t byte_size, std::string* output) { size_t prev = input.length(); TruncateUTF8ToByteSize(input, byte_size, output); @@ -74,7 +75,7 @@ TEST(StringUtilTest, TruncateUTF8ToByteSize) { EXPECT_EQ(output, ""); EXPECT_TRUE(Truncated("\xe1\x80\xbf", 0, &output)); EXPECT_EQ(output, ""); - EXPECT_FALSE(Truncated("\xe1\x80\xbf", -1, &output)); + EXPECT_FALSE(Truncated("\xe1\x80\xbf", static_cast<size_t>(-1), &output)); EXPECT_FALSE(Truncated("\xe1\x80\xbf", 4, &output)); // Testing the truncation of valid UTF8 correctly |