[llvm-commits] CVS: llvm/include/llvm/ADT/SmallVector.h

[Jeff Cohen]

Changes in directory llvm/include/llvm/ADT:

SmallVector.h updated: 1.27 -> 1.28
---
Log message:

Fix some VC++ warnings.

---
Diffs of the changes:  (+4 -4)

 SmallVector.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm/include/llvm/ADT/SmallVector.h
diff -u llvm/include/llvm/ADT/SmallVector.h:1.27 llvm/include/llvm/ADT/SmallVector.h:1.28
--- llvm/include/llvm/ADT/SmallVector.h:1.27	Mon Mar  5 11:22:33 2007
+++ llvm/include/llvm/ADT/SmallVector.h	Wed Apr 18 21:04:09 2007
@@ -308,8 +308,8 @@
 // Define this out-of-line to dissuade the C++ compiler from inlining it.
 template <typename T>
 void SmallVectorImpl<T>::grow(unsigned MinSize) {
-  unsigned CurCapacity = Capacity-Begin;
-  unsigned CurSize = size();
+  unsigned CurCapacity = unsigned(Capacity-Begin);
+  unsigned CurSize = unsigned(size());
   unsigned NewCapacity = 2*CurCapacity;
   if (NewCapacity < MinSize)
     NewCapacity = MinSize;
@@ -376,8 +376,8 @@
   
   // If we already have sufficient space, assign the common elements, then
   // destroy any excess.
-  unsigned RHSSize = RHS.size();
-  unsigned CurSize = size();
+  unsigned RHSSize = unsigned(RHS.size());
+  unsigned CurSize = unsigned(size());
   if (CurSize >= RHSSize) {
     // Assign common elements.
     iterator NewEnd = std::copy(RHS.Begin, RHS.Begin+RHSSize, Begin);