Index: include/llvm/Type.h
===================================================================
RCS file: /var/cvs/llvm/llvm/include/llvm/Type.h,v
retrieving revision 1.67
diff -u -r1.67 Type.h
--- include/llvm/Type.h	19 Nov 2004 16:39:04 -0000	1.67
+++ include/llvm/Type.h	13 Dec 2004 13:11:57 -0000
@@ -246,7 +246,8 @@
 
   /// getNumContainedTypes - Return the number of types in the derived type.
   ///
-  unsigned getNumContainedTypes() const { return ContainedTys.size(); }
+  typedef std::vector<PATypeHandle>::size_type size_type;
+  size_type getNumContainedTypes() const { return ContainedTys.size(); }
 
   //===--------------------------------------------------------------------===//
   // Static members exported by the Type class itself.  Useful for getting
Index: include/llvm/Value.h
===================================================================
RCS file: /var/cvs/llvm/llvm/include/llvm/Value.h,v
retrieving revision 1.66
diff -u -r1.66 Value.h
--- include/llvm/Value.h	27 Oct 2004 16:14:47 -0000	1.66
+++ include/llvm/Value.h	6 Dec 2004 11:24:02 -0000
@@ -89,8 +89,9 @@
   //
   typedef UseListIteratorWrapper      use_iterator;
   typedef UseListConstIteratorWrapper use_const_iterator;
+  typedef iplist<Use>::size_type      size_type;
 
-  unsigned           use_size()  const { return Uses.size();  }
+  size_type          use_size()  const { return Uses.size();  }
   bool               use_empty() const { return Uses.empty(); }
   use_iterator       use_begin()       { return Uses.begin(); }
   use_const_iterator use_begin() const { return Uses.begin(); }
Index: include/llvm/Support/CommandLine.h
===================================================================
RCS file: /var/cvs/llvm/llvm/include/llvm/Support/CommandLine.h,v
retrieving revision 1.40
diff -u -r1.40 CommandLine.h
--- include/llvm/Support/CommandLine.h	5 Dec 2004 05:17:34 -0000	1.40
+++ include/llvm/Support/CommandLine.h	6 Dec 2004 10:08:04 -0000
@@ -435,7 +435,7 @@
   typedef DataType parser_data_type;
 
   // Implement virtual functions needed by generic_parser_base
-  unsigned getNumOptions() const { return Values.size(); }
+  unsigned getNumOptions() const { return (unsigned)Values.size(); }
   const char *getOption(unsigned N) const { return Values[N].first; }
   const char *getDescription(unsigned N) const {
     return Values[N].second.second;
