Rename contype to subtype

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

diff --git a/include/llvm/CFG.h b/include/llvm/CFG.h
index 377d3196cec3f23523ac0d3b61c3f2b4c0397806..40de3a8bd5c19e42e4cc70eb0d98abdbbb3bf3ae 100644 (file)
--- a/include/llvm/CFG.h
+++ b/include/llvm/CFG.h
@@ -205,13 +205,13 @@ struct ConstInverseBasicBlockGraph {
 
 struct TypeGraph {
   typedef const ::Type NodeType;
-  typedef ::Type::contype_iterator ChildIteratorType;
+  typedef ::Type::subtype_iterator ChildIteratorType;
   
   static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->contype_begin(); 
+    return N->subtype_begin(); 
   }
   static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->contype_end();
+    return N->subtype_end();
   }
 };
 

diff --git a/include/llvm/Type.h b/include/llvm/Type.h
index d5f57cba04bdd6fc1edfb0d7179efc109a6752ef..afc197049d088a727861720254ac885462e2659d 100644 (file)
--- a/include/llvm/Type.h
+++ b/include/llvm/Type.h
@@ -145,9 +145,9 @@ public:
   // Type Iteration support
   //
   class TypeIterator;
-  typedef TypeIterator contype_iterator;
-  inline contype_iterator contype_begin() const;   // DEFINED BELOW
-  inline contype_iterator contype_end() const;     // DEFINED BELOW
+  typedef TypeIterator subtype_iterator;
+  inline subtype_iterator subtype_begin() const;   // DEFINED BELOW
+  inline subtype_iterator subtype_end() const;     // DEFINED BELOW
 
   // getContainedType - This method is used to implement the type iterator
   // (defined a the end of the file).  For derived types, this returns the types
@@ -243,11 +243,11 @@ private:
   };
 };
 
-inline Type::TypeIterator Type::contype_begin() const {
+inline Type::TypeIterator Type::subtype_begin() const {
   return TypeIterator(this, 0);
 }
 
-inline Type::TypeIterator Type::contype_end() const {
+inline Type::TypeIterator Type::subtype_end() const {
   return TypeIterator(this, getNumContainedTypes());
 }
 

diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index 87fa581a573ea5c25670a8d86aae04dde7c0bd41..d2b23d482d0e933181b50357c9558bce7dc8f022 100644 (file)
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -310,8 +310,8 @@ static bool TypesEqual(const Type *Ty, const Type *Ty2,
   }
 
   // Iterate over the types and make sure the the contents are equivalent...
-  Type::contype_iterator I  = Ty ->contype_begin(), IE  = Ty ->contype_end();
-  Type::contype_iterator I2 = Ty2->contype_begin(), IE2 = Ty2->contype_end();
+  Type::subtype_iterator I  = Ty ->subtype_begin(), IE  = Ty ->subtype_end();
+  Type::subtype_iterator I2 = Ty2->subtype_begin(), IE2 = Ty2->subtype_end();
   for (; I != IE && I2 != IE2; ++I, ++I2)
     if (!TypesEqual(*I, *I2, EqTypes)) return false;