diff options
| author | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 08:59:40 +0000 |
|---|---|---|
| committer | raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 08:59:40 +0000 |
| commit | 6d4ca3bb568db541ef01c050208c42d97fdad676 (patch) | |
| tree | 4f1af9a2823d0119689e20377ca9106a520a1da7 /base | |
| parent | dc03347da74eed11baded360868fcc739575203d (diff) | |
| download | chromium_src-6d4ca3bb568db541ef01c050208c42d97fdad676.zip chromium_src-6d4ca3bb568db541ef01c050208c42d97fdad676.tar.gz chromium_src-6d4ca3bb568db541ef01c050208c42d97fdad676.tar.bz2 | |
Avoid C++11 narrowing errors.
C++11 is picker about narrowing inside initializers. Avoid errors related to
that by explicitly casting to the appropriate types or changing the types in
function declarations where possible.
BUG=
TEST=Build with gcc and -Wnarrowing.
Review URL: https://chromiumcodereview.appspot.com/13878015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/strings/string_number_conversions_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/strings/string_number_conversions_unittest.cc b/base/strings/string_number_conversions_unittest.cc index fe22be9..937bfb8 100644 --- a/base/strings/string_number_conversions_unittest.cc +++ b/base/strings/string_number_conversions_unittest.cc @@ -317,19 +317,19 @@ TEST(StringNumberConversionsTest, HexStringToUInt64) { } cases[] = { {"0", 0, true}, {"42", 66, true}, - {"-42", -66, true}, + {"-42", static_cast<uint64>(-66), true}, {"+42", 66, true}, {"40acd88557b", GG_INT64_C(4444444448123), true}, {"7fffffff", INT_MAX, true}, - {"-80000000", INT_MIN, true}, + {"-80000000", static_cast<uint64>(INT_MIN), true}, {"ffffffff", 0xffffffff, true}, {"DeadBeef", 0xdeadbeef, true}, {"0x42", 66, true}, - {"-0x42", -66, true}, + {"-0x42", static_cast<uint64>(-66), true}, {"+0x42", 66, true}, {"0x40acd88557b", GG_INT64_C(4444444448123), true}, {"0x7fffffff", INT_MAX, true}, - {"-0x80000000", INT_MIN, true}, + {"-0x80000000", static_cast<uint64>(INT_MIN), true}, {"0xffffffff", 0xffffffff, true}, {"0XDeadBeef", 0xdeadbeef, true}, {"0x7fffffffffffffff", kint64max, true}, |