[llvm-commits] CVS: llvm/include/llvm/BasicBlock.h DerivedTypes.h Function.h Instructions.h Module.h SymbolTable.h User.h
Chris Lattner
lattner at cs.uiuc.edu
Mon Nov 15 11:02:50 PST 2004
Changes in directory llvm/include/llvm:
BasicBlock.h updated: 1.44 -> 1.45
DerivedTypes.h updated: 1.63 -> 1.64
Function.h updated: 1.54 -> 1.55
Instructions.h updated: 1.6 -> 1.7
Module.h updated: 1.53 -> 1.54
SymbolTable.h updated: 1.37 -> 1.38
User.h updated: 1.31 -> 1.32
---
Log message:
Warning fixes for VC++, contributed by Morten Ofstad!
---
Diffs of the changes: (+14 -14)
Index: llvm/include/llvm/BasicBlock.h
diff -u llvm/include/llvm/BasicBlock.h:1.44 llvm/include/llvm/BasicBlock.h:1.45
--- llvm/include/llvm/BasicBlock.h:1.44 Wed Oct 27 11:14:47 2004
+++ llvm/include/llvm/BasicBlock.h Mon Nov 15 13:02:35 2004
@@ -121,7 +121,7 @@
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(); }
Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.63 llvm/include/llvm/DerivedTypes.h:1.64
--- llvm/include/llvm/DerivedTypes.h:1.63 Tue Oct 19 00:49:46 2004
+++ llvm/include/llvm/DerivedTypes.h Mon Nov 15 13:02:35 2004
@@ -140,7 +140,7 @@
/// 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 @@
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];
Index: llvm/include/llvm/Function.h
diff -u llvm/include/llvm/Function.h:1.54 llvm/include/llvm/Function.h:1.55
--- llvm/include/llvm/Function.h:1.54 Tue Oct 19 00:50:34 2004
+++ llvm/include/llvm/Function.h Mon Nov 15 13:02:35 2004
@@ -168,7 +168,7 @@
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 @@
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(); }
Index: llvm/include/llvm/Instructions.h
diff -u llvm/include/llvm/Instructions.h:1.6 llvm/include/llvm/Instructions.h:1.7
--- llvm/include/llvm/Instructions.h:1.6 Wed Oct 27 11:14:47 2004
+++ llvm/include/llvm/Instructions.h Mon Nov 15 13:02:35 2004
@@ -275,7 +275,7 @@
: 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 @@
/// 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 @@
/// 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 @@
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; }
Index: llvm/include/llvm/Module.h
diff -u llvm/include/llvm/Module.h:1.53 llvm/include/llvm/Module.h:1.54
--- llvm/include/llvm/Module.h:1.53 Fri Oct 29 14:20:42 2004
+++ llvm/include/llvm/Module.h Mon Nov 15 13:02:35 2004
@@ -201,7 +201,7 @@
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 @@
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 @@
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); }
Index: llvm/include/llvm/SymbolTable.h
diff -u llvm/include/llvm/SymbolTable.h:1.37 llvm/include/llvm/SymbolTable.h:1.38
--- llvm/include/llvm/SymbolTable.h:1.37 Sat Jul 17 18:30:45 2004
+++ llvm/include/llvm/SymbolTable.h Mon Nov 15 13:02:35 2004
@@ -119,7 +119,7 @@
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
Index: llvm/include/llvm/User.h
diff -u llvm/include/llvm/User.h:1.31 llvm/include/llvm/User.h:1.32
--- llvm/include/llvm/User.h:1.31 Sat Jul 17 18:32:11 2004
+++ llvm/include/llvm/User.h Mon Nov 15 13:02:35 2004
@@ -44,7 +44,7 @@
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...
More information about the llvm-commits
mailing list