From: Daniel Dunbar Date: Mon, 14 Sep 2009 02:38:53 +0000 (+0000) Subject: Attempt to fix some 4.0.0 build warnings. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9c29730bb3e9dd52d226d0d14a727139f61a936d;p=oota-llvm.git Attempt to fix some 4.0.0 build warnings. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81752 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/unittests/ADT/APIntTest.cpp b/unittests/ADT/APIntTest.cpp index 5de7d08b899..9423316b59b 100644 --- a/unittests/ADT/APIntTest.cpp +++ b/unittests/ADT/APIntTest.cpp @@ -175,11 +175,11 @@ TEST(APIntTest, fromString) { EXPECT_EQ(APInt(32, 3), APInt(32, "+11", 2)); EXPECT_EQ(APInt(32, 4), APInt(32, "+100", 2)); - EXPECT_EQ(APInt(32, -0), APInt(32, "-0", 2)); - EXPECT_EQ(APInt(32, -1), APInt(32, "-1", 2)); - EXPECT_EQ(APInt(32, -2), APInt(32, "-10", 2)); - EXPECT_EQ(APInt(32, -3), APInt(32, "-11", 2)); - EXPECT_EQ(APInt(32, -4), APInt(32, "-100", 2)); + EXPECT_EQ(APInt(32, -0LL), APInt(32, "-0", 2)); + EXPECT_EQ(APInt(32, -1LL), APInt(32, "-1", 2)); + EXPECT_EQ(APInt(32, -2LL), APInt(32, "-10", 2)); + EXPECT_EQ(APInt(32, -3LL), APInt(32, "-11", 2)); + EXPECT_EQ(APInt(32, -4LL), APInt(32, "-100", 2)); EXPECT_EQ(APInt(32, 0), APInt(32, "0", 8)); @@ -196,12 +196,12 @@ TEST(APIntTest, fromString) { EXPECT_EQ(APInt(32, +15), APInt(32, "+17", 8)); EXPECT_EQ(APInt(32, +16), APInt(32, "+20", 8)); - EXPECT_EQ(APInt(32, -0), APInt(32, "-0", 8)); - EXPECT_EQ(APInt(32, -1), APInt(32, "-1", 8)); - EXPECT_EQ(APInt(32, -7), APInt(32, "-7", 8)); - EXPECT_EQ(APInt(32, -8), APInt(32, "-10", 8)); - EXPECT_EQ(APInt(32, -15), APInt(32, "-17", 8)); - EXPECT_EQ(APInt(32, -16), APInt(32, "-20", 8)); + EXPECT_EQ(APInt(32, -0LL), APInt(32, "-0", 8)); + EXPECT_EQ(APInt(32, -1LL), APInt(32, "-1", 8)); + EXPECT_EQ(APInt(32, -7LL), APInt(32, "-7", 8)); + EXPECT_EQ(APInt(32, -8LL), APInt(32, "-10", 8)); + EXPECT_EQ(APInt(32, -15LL), APInt(32, "-17", 8)); + EXPECT_EQ(APInt(32, -16LL), APInt(32, "-20", 8)); EXPECT_EQ(APInt(32, 0), APInt(32, "0", 10)); @@ -211,12 +211,12 @@ TEST(APIntTest, fromString) { EXPECT_EQ(APInt(32, 19), APInt(32, "19", 10)); EXPECT_EQ(APInt(32, 20), APInt(32, "20", 10)); - EXPECT_EQ(APInt(32, -0), APInt(32, "-0", 10)); - EXPECT_EQ(APInt(32, -1), APInt(32, "-1", 10)); - EXPECT_EQ(APInt(32, -9), APInt(32, "-9", 10)); - EXPECT_EQ(APInt(32, -10), APInt(32, "-10", 10)); - EXPECT_EQ(APInt(32, -19), APInt(32, "-19", 10)); - EXPECT_EQ(APInt(32, -20), APInt(32, "-20", 10)); + EXPECT_EQ(APInt(32, -0LL), APInt(32, "-0", 10)); + EXPECT_EQ(APInt(32, -1LL), APInt(32, "-1", 10)); + EXPECT_EQ(APInt(32, -9LL), APInt(32, "-9", 10)); + EXPECT_EQ(APInt(32, -10LL), APInt(32, "-10", 10)); + EXPECT_EQ(APInt(32, -19LL), APInt(32, "-19", 10)); + EXPECT_EQ(APInt(32, -20LL), APInt(32, "-20", 10)); EXPECT_EQ(APInt(32, 0), APInt(32, "0", 16)); @@ -226,12 +226,12 @@ TEST(APIntTest, fromString) { EXPECT_EQ(APInt(32, 31), APInt(32, "1F", 16)); EXPECT_EQ(APInt(32, 32), APInt(32, "20", 16)); - EXPECT_EQ(APInt(32, -0), APInt(32, "-0", 16)); - EXPECT_EQ(APInt(32, -1), APInt(32, "-1", 16)); - EXPECT_EQ(APInt(32, -15), APInt(32, "-F", 16)); - EXPECT_EQ(APInt(32, -16), APInt(32, "-10", 16)); - EXPECT_EQ(APInt(32, -31), APInt(32, "-1F", 16)); - EXPECT_EQ(APInt(32, -32), APInt(32, "-20", 16)); + EXPECT_EQ(APInt(32, -0LL), APInt(32, "-0", 16)); + EXPECT_EQ(APInt(32, -1LL), APInt(32, "-1", 16)); + EXPECT_EQ(APInt(32, -15LL), APInt(32, "-F", 16)); + EXPECT_EQ(APInt(32, -16LL), APInt(32, "-10", 16)); + EXPECT_EQ(APInt(32, -31LL), APInt(32, "-1F", 16)); + EXPECT_EQ(APInt(32, -32LL), APInt(32, "-20", 16)); } TEST(APIntTest, StringBitsNeeded2) {