Another try at fixing compile warnings on 4.0

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82148 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/ADT/APIntTest.cpp b/unittests/ADT/APIntTest.cpp
index 9423316b59b0aeafdc817658a96e6189cc9a2969..d910f51db7579bec804c0cfc21a51116dc525763 100644 (file)
--- a/unittests/ADT/APIntTest.cpp
+++ b/unittests/ADT/APIntTest.cpp
@@ -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,  -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,  uint64_t(-0LL)), APInt(32,  "-0",  8));
+  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1",  8));
+  EXPECT_EQ(APInt(32,  uint64_t(-7LL)), APInt(32,  "-7",  8));
+  EXPECT_EQ(APInt(32,  uint64_t(-8LL)), APInt(32,  "-10", 8));
+  EXPECT_EQ(APInt(32, uint64_t(-15LL)), APInt(32,  "-17", 8));
+  EXPECT_EQ(APInt(32, uint64_t(-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,  -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,  uint64_t(-0LL)), APInt(32,  "-0", 10));
+  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1", 10));
+  EXPECT_EQ(APInt(32,  uint64_t(-9LL)), APInt(32,  "-9", 10));
+  EXPECT_EQ(APInt(32, uint64_t(-10LL)), APInt(32, "-10", 10));
+  EXPECT_EQ(APInt(32, uint64_t(-19LL)), APInt(32, "-19", 10));
+  EXPECT_EQ(APInt(32, uint64_t(-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,  -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));
+  EXPECT_EQ(APInt(32,  uint64_t(-0LL)), APInt(32,  "-0", 16));
+  EXPECT_EQ(APInt(32,  uint64_t(-1LL)), APInt(32,  "-1", 16));
+  EXPECT_EQ(APInt(32, uint64_t(-15LL)), APInt(32,  "-F", 16));
+  EXPECT_EQ(APInt(32, uint64_t(-16LL)), APInt(32, "-10", 16));
+  EXPECT_EQ(APInt(32, uint64_t(-31LL)), APInt(32, "-1F", 16));
+  EXPECT_EQ(APInt(32, uint64_t(-32LL)), APInt(32, "-20", 16));
 }
 
 TEST(APIntTest, StringBitsNeeded2) {