Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Unified Diff: cc/hash_pair_unittest.cc

Issue 11428117: Fix compile warnings for 64-bit constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GG_LONGLONG -> GG_INT64_C Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/hash_pair_unittest.cc
diff --git a/cc/hash_pair_unittest.cc b/cc/hash_pair_unittest.cc
index a3218ec9cd69a34026b349d43b713601999a7e51..249b8323c48e462d7d3328db1085dc184e2bb2a0 100644
--- a/cc/hash_pair_unittest.cc
+++ b/cc/hash_pair_unittest.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "cc/hash_pair.h"
+
+#include "base/basictypes.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -28,7 +30,8 @@ TEST_F(HashPairTest, IntegerPairs) {
INSERT_PAIR_TEST(ShortShortPair, 4, 6);
INSERT_PAIR_TEST(ShortIntPair, 7, (1 << 30) + 4342);
INSERT_PAIR_TEST(ShortInt32Pair, 9, (1 << 29) + 378128932);
- INSERT_PAIR_TEST(ShortInt64Pair, 10, (1LL << 60) + 78931732321);
+ INSERT_PAIR_TEST(ShortInt64Pair, 10,
+ (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
typedef std::pair<int, short> IntShortPair;
typedef std::pair<int, int> IntIntPair;
@@ -38,7 +41,8 @@ TEST_F(HashPairTest, IntegerPairs) {
INSERT_PAIR_TEST(IntShortPair, 4, 6);
INSERT_PAIR_TEST(IntIntPair, 7, (1 << 30) + 4342);
INSERT_PAIR_TEST(IntInt32Pair, 9, (1 << 29) + 378128932);
- INSERT_PAIR_TEST(IntInt64Pair, 10, (1LL << 60) + 78931732321);
+ INSERT_PAIR_TEST(IntInt64Pair, 10,
+ (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
typedef std::pair<int32, short> Int32ShortPair;
typedef std::pair<int32, int> Int32IntPair;
@@ -48,7 +52,8 @@ TEST_F(HashPairTest, IntegerPairs) {
INSERT_PAIR_TEST(Int32ShortPair, 4, 6);
INSERT_PAIR_TEST(Int32IntPair, 7, (1 << 30) + 4342);
INSERT_PAIR_TEST(Int32Int32Pair, 9, (1 << 29) + 378128932);
- INSERT_PAIR_TEST(Int32Int64Pair, 10, (1LL << 60) + 78931732321);
+ INSERT_PAIR_TEST(Int32Int64Pair, 10,
+ (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
typedef std::pair<int64, short> Int64ShortPair;
typedef std::pair<int64, int> Int64IntPair;
@@ -58,7 +63,8 @@ TEST_F(HashPairTest, IntegerPairs) {
INSERT_PAIR_TEST(Int64ShortPair, 4, 6);
INSERT_PAIR_TEST(Int64IntPair, 7, (1 << 30) + 4342);
INSERT_PAIR_TEST(Int64Int32Pair, 9, (1 << 29) + 378128932);
- INSERT_PAIR_TEST(Int64Int64Pair, 10, (1LL << 60) + 78931732321);
+ INSERT_PAIR_TEST(Int64Int64Pair, 10,
+ (GG_INT64_C(1) << 60) + GG_INT64_C(78931732321));
}
} // anonymous namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698