[llvm-branch-commits] [llvm-branch] r84384 - in /llvm/branches/Apple/Leela/include/llvm: ADT/DenseMapInfo.h Support/ValueHandle.h

[Eric Christopher]

Author: echristo
Date: Sat Oct 17 19:14:18 2009
New Revision: 84384

URL: http://llvm.org/viewvc/llvm-project?rev=84384&view=rev
Log:
Bring:

Author: echristo
Date: Sat Oct 17 18:56:18 2009
New Revision: 84382

URL: http://llvm.org/viewvc/llvm-project?rev=84382&view=rev
Log:
More warnings patrol: Another unused argument and more implicit
conversions.

>From mainline.

Modified:
    llvm/branches/Apple/Leela/include/llvm/ADT/DenseMapInfo.h
    llvm/branches/Apple/Leela/include/llvm/Support/ValueHandle.h

Modified: llvm/branches/Apple/Leela/include/llvm/ADT/DenseMapInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/ADT/DenseMapInfo.h?rev=84384&r1=84383&r2=84384&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/ADT/DenseMapInfo.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/ADT/DenseMapInfo.h Sat Oct 17 19:14:18 2009
@@ -76,7 +76,7 @@
   static inline unsigned long getEmptyKey() { return ~0UL; }
   static inline unsigned long getTombstoneKey() { return ~0UL - 1L; }
   static unsigned getHashValue(const unsigned long& Val) {
-    return Val * 37UL;
+    return (unsigned)(Val * 37UL);
   }
   static bool isPod() { return true; }
   static bool isEqual(const unsigned long& LHS, const unsigned long& RHS) {
@@ -89,7 +89,7 @@
   static inline unsigned long long getEmptyKey() { return ~0ULL; }
   static inline unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
   static unsigned getHashValue(const unsigned long long& Val) {
-    return (unsigned)Val * 37ULL;
+    return (unsigned)(Val * 37ULL);
   }
   static bool isPod() { return true; }
   static bool isEqual(const unsigned long long& LHS,

Modified: llvm/branches/Apple/Leela/include/llvm/Support/ValueHandle.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/Support/ValueHandle.h?rev=84384&r1=84383&r2=84384&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/Support/ValueHandle.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/Support/ValueHandle.h Sat Oct 17 19:14:18 2009
@@ -361,7 +361,7 @@
   /// _before_ any of the uses have actually been replaced.  If WeakVH were
   /// implemented as a CallbackVH, it would use this method to call
   /// setValPtr(new_value).  AssertingVH would do nothing in this method.
-  virtual void allUsesReplacedWith(Value *new_value) {}
+  virtual void allUsesReplacedWith(Value *) {}
 };
 
 // Specialize simplify_type to allow CallbackVH to participate in