diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 17:35:10 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 17:35:10 +0000 |
| commit | 9406c05f78eccb7cc2849cf87a4202e1538ecb9c (patch) | |
| tree | 37d27e2d2e2f820bc2c045c27a42894d3f76342f /net | |
| parent | 381ae07bab785f46f54ee5ad770dbcfabbe92d6e (diff) | |
| download | chromium_src-9406c05f78eccb7cc2849cf87a4202e1538ecb9c.zip chromium_src-9406c05f78eccb7cc2849cf87a4202e1538ecb9c.tar.gz chromium_src-9406c05f78eccb7cc2849cf87a4202e1538ecb9c.tar.bz2 | |
Remove all uses of GG_LONGLONG and GG_ULONGLONG.
123LL and 123ULL now work everywhere. You can also use INT64_C and
UINT64_C (from <stdint.h>) in Chromium code (we force-define
__STDC_CONSTANT_MACROS). (And sometimes you can just use
static_cast<(u)int64_t>.)
Don't remove their definitions yet, because some macros that are
multiply-defined (in an identical way) rely on them. D'oh.
R=brettw@chromium.org
TBR=sky@chromium.org,satorux@chromium.org,vrk@chromium.org,rch@chromium.org,shess@chromium.org
Review URL: https://codereview.chromium.org/218953003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/int128.cc | 4 | ||||
| -rw-r--r-- | net/base/int128_unittest.cc | 18 |
2 files changed, 8 insertions, 14 deletions
diff --git a/net/base/int128.cc b/net/base/int128.cc index 745d8ed..94275eb 100644 --- a/net/base/int128.cc +++ b/net/base/int128.cc @@ -7,8 +7,8 @@ #include "net/base/int128.h" const uint128_pod kuint128max = { - static_cast<uint64>(GG_LONGLONG(0xFFFFFFFFFFFFFFFF)), - static_cast<uint64>(GG_LONGLONG(0xFFFFFFFFFFFFFFFF)) + static_cast<uint64>(0xFFFFFFFFFFFFFFFFULL), + static_cast<uint64>(0xFFFFFFFFFFFFFFFFULL) }; std::ostream& operator<<(std::ostream& o, const uint128& b) { diff --git a/net/base/int128_unittest.cc b/net/base/int128_unittest.cc index 78790e7..957038b 100644 --- a/net/base/int128_unittest.cc +++ b/net/base/int128_unittest.cc @@ -230,24 +230,18 @@ TEST(Int128, Multiply) { } // Verified with dc. - a = uint128(GG_ULONGLONG(0xffffeeeeddddcccc), - GG_ULONGLONG(0xbbbbaaaa99998888)); - b = uint128(GG_ULONGLONG(0x7777666655554444), - GG_ULONGLONG(0x3333222211110000)); + a = uint128(0xffffeeeeddddccccULL, 0xbbbbaaaa99998888ULL); + b = uint128(0x7777666655554444ULL, 0x3333222211110000ULL); c = a * b; - EXPECT_EQ(uint128(GG_ULONGLONG(0x530EDA741C71D4C3), - GG_ULONGLONG(0xBF25975319080000)), c); + EXPECT_EQ(uint128(0x530EDA741C71D4C3ULL, 0xBF25975319080000ULL), c); EXPECT_EQ(0, c - b * a); EXPECT_EQ(a*a - b*b, (a+b) * (a-b)); // Verified with dc. - a = uint128(GG_ULONGLONG(0x0123456789abcdef), - GG_ULONGLONG(0xfedcba9876543210)); - b = uint128(GG_ULONGLONG(0x02468ace13579bdf), - GG_ULONGLONG(0xfdb97531eca86420)); + a = uint128(0x0123456789abcdefULL, 0xfedcba9876543210ULL); + b = uint128(0x02468ace13579bdfULL, 0xfdb97531eca86420ULL); c = a * b; - EXPECT_EQ(uint128(GG_ULONGLONG(0x97a87f4f261ba3f2), - GG_ULONGLONG(0x342d0bbf48948200)), c); + EXPECT_EQ(uint128(0x97a87f4f261ba3f2ULL, 0x342d0bbf48948200ULL), c); EXPECT_EQ(0, c - b * a); EXPECT_EQ(a*a - b*b, (a+b) * (a-b)); } |