[llvm-commits] CVS: llvm/include/llvm/Constants.h Type.h

[Reid Spencer]

Changes in directory llvm/include/llvm:

Constants.h updated: 1.79 -> 1.80
Type.h updated: 1.84 -> 1.85
---
Log message:

For PR786: http://llvm.cs.uiuc.edu/PR786 :
Minor tweaks in public headers and a few .cpp files so that LLVM can build
successfully with -pedantic and projects using LLVM with -pedantic don't 
get warnings from LLVM. There's still more -pedantic warnings to fix.


---
Diffs of the changes:  (+2 -2)

 Constants.h |    2 +-
 Type.h      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.79 llvm/include/llvm/Constants.h:1.80
--- llvm/include/llvm/Constants.h:1.79	Fri Apr  7 20:15:18 2006
+++ llvm/include/llvm/Constants.h	Wed May 24 14:21:13 2006
@@ -58,7 +58,7 @@
   /// type.
   inline uint64_t getZExtValue() const {
     unsigned Size = getType()->getPrimitiveSizeInBits();
-    return Val.Unsigned & (~0ULL >> (64-Size));
+    return Val.Unsigned & (~uint64_t(0UL) >> (64-Size));
   }
 
   /// getSExtValue - Return the constant sign extended as appropriate for this


Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.84 llvm/include/llvm/Type.h:1.85
--- llvm/include/llvm/Type.h:1.84	Tue Apr  4 14:05:42 2006
+++ llvm/include/llvm/Type.h	Wed May 24 14:21:13 2006
@@ -239,7 +239,7 @@
   /// sbyte/ubyte, 0xFFFF for shorts, etc.
   uint64_t getIntegralTypeMask() const {
     assert(isIntegral() && "This only works for integral types!");
-    return ~0ULL >> (64-getPrimitiveSizeInBits());
+    return ~uint64_t(0UL) >> (64-getPrimitiveSizeInBits());
   }
 
   /// getForwaredType - Return the type that this type has been resolved to if