Warning fixes for VC++, contributed by Morten Ofstad!

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

diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h
index 0ede5f3072a2cff75c1d2ff3c6e0874b4601a815..ed9794207a377081f128fc567bee64b5a9c0b10a 100644 (file)
--- a/include/llvm/BasicBlock.h
+++ b/include/llvm/BasicBlock.h
@@ -121,7 +121,7 @@ public:
   inline reverse_iterator       rend  ()       { return InstList.rend();   }
   inline const_reverse_iterator rend  () const { return InstList.rend();   }
 
-  inline unsigned                 size() const { return InstList.size();  }
+  inline size_t                   size() const { return InstList.size();  }
   inline bool                    empty() const { return InstList.empty(); }
   inline const Instruction      &front() const { return InstList.front(); }
   inline       Instruction      &front()       { return InstList.front(); }

diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h
index c133c57153d3634b4d64143fe8f5f3bd86e84c81..ce110917893448f75b7e67d8838c935c510c3ebb 100644 (file)
--- a/include/llvm/DerivedTypes.h
+++ b/include/llvm/DerivedTypes.h
@@ -140,7 +140,7 @@ public:
   /// getNumParams - Return the number of fixed parameters this function type
   /// requires.  This does not consider varargs.
   ///
-  unsigned getNumParams() const { return ContainedTys.size()-1; }
+  unsigned getNumParams() const { return (unsigned)ContainedTys.size()-1; }
 
   // Implement the AbstractTypeUser interface.
   virtual void refineAbstractType(const DerivedType *OldTy, const Type *NewTy);
@@ -206,7 +206,7 @@ public:
   element_iterator element_end() const { return ContainedTys.end(); }
 
   // Random access to the elements
-  unsigned getNumElements() const { return ContainedTys.size(); }
+  unsigned getNumElements() const { return (unsigned)ContainedTys.size(); }
   const Type *getElementType(unsigned N) const {
     assert(N < ContainedTys.size() && "Element number out of range!");
     return ContainedTys[N];

diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 841912ab2d587ea2cbfa4f0b7fb7ca2fccd264a7..e67ef01a56b3bde3fe290f6de6a1c8510413789d 100644 (file)
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -168,7 +168,7 @@ public:
   reverse_iterator       rend  ()       { return BasicBlocks.rend();   }
   const_reverse_iterator rend  () const { return BasicBlocks.rend();   }
 
-  unsigned                 size() const { return BasicBlocks.size();  }
+  size_t                   size() const { return BasicBlocks.size();  }
   bool                    empty() const { return BasicBlocks.empty(); }
   const BasicBlock       &front() const { return BasicBlocks.front(); }
         BasicBlock       &front()       { return BasicBlocks.front(); }
@@ -188,7 +188,7 @@ public:
   reverse_aiterator       arend  ()       { return ArgumentList.rend();   }
   const_reverse_aiterator arend  () const { return ArgumentList.rend();   }
 
-  unsigned                  asize() const { return ArgumentList.size();  }
+  size_t                    asize() const { return ArgumentList.size();  }
   bool                     aempty() const { return ArgumentList.empty(); }
   const Argument          &afront() const { return ArgumentList.front(); }
         Argument          &afront()       { return ArgumentList.front(); }

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index 5ba361b6465684c06f3292bc68b4c3676efa6d91..714f7d7fb6e13c6e392a1c03defc815a04e06b2c 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -275,7 +275,7 @@ class GetElementPtrInst : public Instruction {
     : Instruction((static_cast<const Instruction*>(&EPI)->getType()),
                   GetElementPtr) {
     Operands.reserve(EPI.Operands.size());
-    for (unsigned i = 0, E = EPI.Operands.size(); i != E; ++i)
+    for (unsigned i = 0, E = (unsigned)EPI.Operands.size(); i != E; ++i)
       Operands.push_back(Use(EPI.Operands[i], this));
   }
   void init(Value *Ptr, const std::vector<Value*> &Idx);
@@ -712,7 +712,7 @@ public:
 
   /// getNumIncomingValues - Return the number of incoming edges
   ///
-  unsigned getNumIncomingValues() const { return Operands.size()/2; }
+  unsigned getNumIncomingValues() const { return (unsigned)Operands.size()/2; }
 
   /// getIncomingValue - Return incoming value #x
   ///
@@ -994,7 +994,7 @@ public:
   /// getNumCases - return the number of 'cases' in this switch instruction.
   /// Note that case #0 is always the default case.
   unsigned getNumCases() const {
-    return Operands.size()/2;
+    return (unsigned)Operands.size()/2;
   }
 
   /// getCaseValue - Return the specified case value.  Note that case #0, the
@@ -1055,7 +1055,7 @@ public:
     assert(idx < getNumSuccessors() && "Successor # out of range!");
     return cast<Constant>(Operands[idx*2].get());
   }
-  virtual unsigned getNumSuccessors() const { return Operands.size()/2; }
+  virtual unsigned getNumSuccessors() const { return (unsigned)Operands.size()/2; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const SwitchInst *) { return true; }

diff --git a/include/llvm/Module.h b/include/llvm/Module.h
index b27a7f303a49112263b3d6c3e182568335487ffc..b645f4e4ea2dc85cd08547fcc85b205a432f61e1 100644 (file)
--- a/include/llvm/Module.h
+++ b/include/llvm/Module.h
@@ -201,7 +201,7 @@ public:
   inline reverse_giterator       grend  ()       { return GlobalList.rend();   }
   inline const_reverse_giterator grend  () const { return GlobalList.rend();   }
 
-  inline unsigned                  gsize() const { return GlobalList.size(); }
+  inline size_t                    gsize() const { return GlobalList.size(); }
   inline bool                     gempty() const { return GlobalList.empty(); }
   inline const GlobalVariable    &gfront() const { return GlobalList.front(); }
   inline       GlobalVariable    &gfront()       { return GlobalList.front(); }
@@ -219,7 +219,7 @@ public:
   inline reverse_iterator       rend  ()       { return FunctionList.rend();   }
   inline const_reverse_iterator rend  () const { return FunctionList.rend();   }
 
-  inline unsigned                 size() const { return FunctionList.size(); }
+  inline size_t                   size() const { return FunctionList.size(); }
   inline bool                    empty() const { return FunctionList.empty(); }
   inline const Function         &front() const { return FunctionList.front(); }
   inline       Function         &front()       { return FunctionList.front(); }
@@ -236,7 +236,7 @@ public:
   inline lib_iterator lib_end() const { return LibraryList.end(); }
 
   /// @brief Returns the number of items in the list of libraries.
-  inline unsigned lib_size() const { return LibraryList.size(); }
+  inline size_t lib_size() const { return LibraryList.size(); }
 
   /// @brief Add a library to the list of dependent libraries
   inline void addLibrary(const std::string& Lib){ LibraryList.insert(Lib); }

diff --git a/include/llvm/SymbolTable.h b/include/llvm/SymbolTable.h
index 032e4a102685957d74d48bf6fcce586dedbe80de..a7f9dd836d9c9093d6978946b4911500fd45fd07 100644 (file)
--- a/include/llvm/SymbolTable.h
+++ b/include/llvm/SymbolTable.h
@@ -119,7 +119,7 @@ public:
   unsigned type_size(const Type *TypeID) const;
 
   /// @brief The number of name/type pairs is returned.
-  inline unsigned num_types() const { return tmap.size(); }
+  inline unsigned num_types() const { return (unsigned)tmap.size(); }
 
   /// Finds the value \p val in the symbol table and returns its
   /// name. Only the type plane associated with the type of \p val

diff --git a/include/llvm/User.h b/include/llvm/User.h
index bd3eb5850b985dcc87372134678e753af3c93320..47f300cd534aafe9888cc43ff8feec4903f5a8f7 100644 (file)
--- a/include/llvm/User.h
+++ b/include/llvm/User.h
@@ -44,7 +44,7 @@ public:
     assert(i < Operands.size() && "setOperand() out of range!");
     Operands[i] = Val;
   }
-  inline unsigned getNumOperands() const { return Operands.size(); }
+  inline unsigned getNumOperands() const { return (unsigned)Operands.size(); }
 
   // ---------------------------------------------------------------------------
   // Operand Iterator interface...