For PR1094:

Make the SetVector::iterator be the vector's const_iterator.

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

diff --git a/include/llvm/ADT/SetVector.h b/include/llvm/ADT/SetVector.h
index f8b37c591838d4cd34c40febd4b751c44b5504da..e70af611a7f693178ca6d83642b764ef98f2565f 100644 (file)
--- a/include/llvm/ADT/SetVector.h
+++ b/include/llvm/ADT/SetVector.h
@@ -37,7 +37,7 @@ public:
   typedef const T& const_reference;
   typedef std::set<value_type> set_type;
   typedef std::vector<value_type> vector_type;
-  typedef typename vector_type::iterator iterator;
+  typedef typename vector_type::const_iterator iterator;
   typedef typename vector_type::const_iterator const_iterator;
   typedef typename vector_type::size_type size_type;
 
@@ -112,7 +112,8 @@ public:
   /// @brief Remove an item from the set vector.
   void remove(const value_type& X) {
     if (0 < set_.erase(X)) {
-      iterator I = std::find(vector_.begin(),vector_.end(),X);
+      typename vector_type::iterator I =
+        std::find(vector_.begin(), vector_.end(), X);
       assert(I != vector_.end() && "Corrupted SetVector instances!");
       vector_.erase(I);
     }