[llvm-branch-commits] [llvm-branch] r86007 - /llvm/branches/Apple/Leela/include/llvm/Metadata.h

[Bill Wendling]

Author: void
Date: Tue Nov  3 23:28:29 2009
New Revision: 86007

URL: http://llvm.org/viewvc/llvm-project?rev=86007&view=rev
Log:
$ svn merge -c 86000 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r86000 into '.':
U    include/llvm/Metadata.h


Modified:
    llvm/branches/Apple/Leela/include/llvm/Metadata.h

Modified: llvm/branches/Apple/Leela/include/llvm/Metadata.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/include/llvm/Metadata.h?rev=86007&r1=86006&r2=86007&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/include/llvm/Metadata.h (original)
+++ llvm/branches/Apple/Leela/include/llvm/Metadata.h Tue Nov  3 23:28:29 2009
@@ -63,7 +63,7 @@
   
   StringRef getString() const { return Str; }
 
-  unsigned getLength() const { return Str.size(); }
+  unsigned getLength() const { return (unsigned)Str.size(); }
 
   typedef StringRef::iterator iterator;
   
@@ -191,7 +191,7 @@
 
   /// getNumElements - Return number of NamedMDNode elements.
   unsigned getNumElements() const {
-    return Node.size();
+    return (unsigned)Node.size();
   }
 
   /// addElement - Add metadata element.