[llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp

[Chris Lattner]

Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.138 -> 1.139
---
Log message:

add a hack to work around broken VC++ scoping rules.  Thx to JeffC for pointing
this out to me


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

 Constants.cpp |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)


Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.138 llvm/lib/VMCore/Constants.cpp:1.139
--- llvm/lib/VMCore/Constants.cpp:1.138	Tue Oct  4 16:35:50 2005
+++ llvm/lib/VMCore/Constants.cpp	Fri Oct  7 00:23:36 2005
@@ -250,12 +250,12 @@
   Use *OL = OperandList;
   for (std::vector<Constant*>::const_iterator I = V.begin(), E = V.end();
        I != E; ++I, ++OL) {
-    Constant *E = *I;
-    assert((E->getType() == T->getElementType() ||
+    Constant *C = *I;
+    assert((C->getType() == T->getElementType() ||
             (T->isAbstract() &&
-             E->getType()->getTypeID() == T->getElementType()->getTypeID())) &&
+             C->getType()->getTypeID() == T->getElementType()->getTypeID())) &&
            "Initializer for array element doesn't match array element type!");
-    OL->init(E, this);
+    OL->init(C, this);
   }
 }
 
@@ -271,14 +271,14 @@
   Use *OL = OperandList;
   for (std::vector<Constant*>::const_iterator I = V.begin(), E = V.end();
        I != E; ++I, ++OL) {
-    Constant *E = *I;
-    assert((E->getType() == T->getElementType(I-V.begin()) ||
+    Constant *C = *I;
+    assert((C->getType() == T->getElementType(I-V.begin()) ||
             ((T->getElementType(I-V.begin())->isAbstract() ||
-              E->getType()->isAbstract()) &&
+              C->getType()->isAbstract()) &&
              T->getElementType(I-V.begin())->getTypeID() == 
-                   E->getType()->getTypeID())) &&
+                   C->getType()->getTypeID())) &&
            "Initializer for struct element doesn't match struct element type!");
-    OL->init(E, this);
+    OL->init(C, this);
   }
 }
 
@@ -293,12 +293,12 @@
   Use *OL = OperandList;
     for (std::vector<Constant*>::const_iterator I = V.begin(), E = V.end();
          I != E; ++I, ++OL) {
-      Constant *E = *I;
-      assert((E->getType() == T->getElementType() ||
+      Constant *C = *I;
+      assert((C->getType() == T->getElementType() ||
             (T->isAbstract() &&
-             E->getType()->getTypeID() == T->getElementType()->getTypeID())) &&
+             C->getType()->getTypeID() == T->getElementType()->getTypeID())) &&
            "Initializer for packed element doesn't match packed element type!");
-    OL->init(E, this);
+    OL->init(C, this);
   }
 }