iterator -> Iterator. You should be auto-ing it anyway.

c++/src/capnproto/dynamic.h

@@ -423,9 +423,9 @@ public:
   inline uint size() const { return reader.size() / ELEMENTS; }
   DynamicValue::Reader operator[](uint index) const;
 
-  typedef internal::IndexingIterator<const Reader, DynamicValue::Reader> iterator;
-  inline iterator begin() const { return iterator(this, 0); }
-  inline iterator end() const { return iterator(this, size()); }
+  typedef internal::IndexingIterator<const Reader, DynamicValue::Reader> Iterator;
+  inline Iterator begin() const { return Iterator(this, 0); }
+  inline Iterator end() const { return Iterator(this, size()); }
 
 private:
   ListSchema schema;
@@ -461,9 +461,9 @@ public:
   void set(uint index, const DynamicValue::Reader& value);
   DynamicValue::Builder init(uint index, uint size);
 
-  typedef internal::IndexingIterator<Builder, DynamicStruct::Builder> iterator;
-  inline iterator begin() { return iterator(this, 0); }
-  inline iterator end() { return iterator(this, size()); }
+  typedef internal::IndexingIterator<Builder, DynamicStruct::Builder> Iterator;
+  inline Iterator begin() { return Iterator(this, 0); }
+  inline Iterator end() { return Iterator(this, size()); }
 
   void copyFrom(std::initializer_list<DynamicValue::Reader> value);
 

c++/src/capnproto/list.h

@@ -195,9 +195,9 @@ struct List<T, Kind::PRIMITIVE> {
       return reader.template getDataElement<T>(index * ELEMENTS);
     }
 
-    typedef internal::IndexingIterator<const Reader, T> iterator;
-    inline iterator begin() const { return iterator(this, 0); }
-    inline iterator end() const { return iterator(this, size()); }
+    typedef internal::IndexingIterator<const Reader, T> Iterator;
+    inline Iterator begin() const { return Iterator(this, 0); }
+    inline Iterator end() const { return Iterator(this, size()); }
 
   private:
     internal::ListReader reader;
@@ -231,9 +231,9 @@ struct List<T, Kind::PRIMITIVE> {
       builder.template setDataElement<T>(index * ELEMENTS, value);
     }
 
-    typedef internal::IndexingIterator<Builder, T> iterator;
-    inline iterator begin() { return iterator(this, 0); }
-    inline iterator end() { return iterator(this, size()); }
+    typedef internal::IndexingIterator<Builder, T> Iterator;
+    inline Iterator begin() { return Iterator(this, 0); }
+    inline Iterator end() { return Iterator(this, size()); }
 
   private:
     internal::ListBuilder builder;
@@ -294,9 +294,9 @@ struct List<T, Kind::STRUCT> {
       return typename T::Reader(reader.getStructElement(index * ELEMENTS));
     }
 
-    typedef internal::IndexingIterator<const Reader, typename T::Reader> iterator;
-    inline iterator begin() const { return iterator(this, 0); }
-    inline iterator end() const { return iterator(this, size()); }
+    typedef internal::IndexingIterator<const Reader, typename T::Reader> Iterator;
+    inline Iterator begin() const { return Iterator(this, 0); }
+    inline Iterator end() const { return Iterator(this, size()); }
 
   private:
     internal::ListReader reader;
@@ -326,9 +326,9 @@ struct List<T, Kind::STRUCT> {
     // be redundant, and set() would risk data loss if the input struct were from a newer version
     // of teh protocol.
 
-    typedef internal::IndexingIterator<Builder, typename T::Builder> iterator;
-    inline iterator begin() { return iterator(this, 0); }
-    inline iterator end() { return iterator(this, size()); }
+    typedef internal::IndexingIterator<Builder, typename T::Builder> Iterator;
+    inline Iterator begin() { return Iterator(this, 0); }
+    inline Iterator end() { return Iterator(this, size()); }
 
   private:
     internal::ListBuilder builder;
@@ -386,9 +386,9 @@ struct List<List<T>, Kind::LIST> {
       return typename List<T>::Reader(List<T>::getAsElementOf(reader, index));
     }
 
-    typedef internal::IndexingIterator<const Reader, typename List<T>::Reader> iterator;
-    inline iterator begin() const { return iterator(this, 0); }
-    inline iterator end() const { return iterator(this, size()); }
+    typedef internal::IndexingIterator<const Reader, typename List<T>::Reader> Iterator;
+    inline Iterator begin() const { return Iterator(this, 0); }
+    inline Iterator end() const { return Iterator(this, size()); }
 
   private:
     internal::ListReader reader;
@@ -426,9 +426,9 @@ struct List<List<T>, Kind::LIST> {
       }
     }
 
-    typedef internal::IndexingIterator<Builder, typename List<T>::Builder> iterator;
-    inline iterator begin() { return iterator(this, 0); }
-    inline iterator end() { return iterator(this, size()); }
+    typedef internal::IndexingIterator<Builder, typename List<T>::Builder> Iterator;
+    inline Iterator begin() { return Iterator(this, 0); }
+    inline Iterator end() { return Iterator(this, size()); }
 
   private:
     internal::ListBuilder builder;
@@ -484,9 +484,9 @@ struct List<T, Kind::BLOB> {
       return reader.getBlobElement<T>(index * ELEMENTS);
     }
 
-    typedef internal::IndexingIterator<const Reader, typename T::Reader> iterator;
-    inline iterator begin() const { return iterator(this, 0); }
-    inline iterator end() const { return iterator(this, size()); }
+    typedef internal::IndexingIterator<const Reader, typename T::Reader> Iterator;
+    inline Iterator begin() const { return Iterator(this, 0); }
+    inline Iterator end() const { return Iterator(this, size()); }
 
   private:
     internal::ListReader reader;
@@ -517,9 +517,9 @@ struct List<T, Kind::BLOB> {
       return builder.initBlobElement<T>(index * ELEMENTS, size * BYTES);
     }
 
-    typedef internal::IndexingIterator<Builder, typename T::Builder> iterator;
-    inline iterator begin() { return iterator(this, 0); }
-    inline iterator end() { return iterator(this, size()); }
+    typedef internal::IndexingIterator<Builder, typename T::Builder> Iterator;
+    inline Iterator begin() { return Iterator(this, 0); }
+    inline Iterator end() { return Iterator(this, size()); }
 
   private:
     internal::ListBuilder builder;

c++/src/capnproto/schema.h

@@ -185,9 +185,9 @@ public:
   inline uint size() const { return list.size(); }
   inline Member operator[](uint index) const { return Member(parent, unionIndex, index, list[index]); }
 
-  typedef internal::IndexingIterator<const MemberList, Member> iterator;
-  inline iterator begin() const { return iterator(this, 0); }
-  inline iterator end() const { return iterator(this, size()); }
+  typedef internal::IndexingIterator<const MemberList, Member> Iterator;
+  inline Iterator begin() const { return Iterator(this, 0); }
+  inline Iterator end() const { return Iterator(this, size()); }
 
 private:
   StructSchema parent;
@@ -254,9 +254,9 @@ public:
   inline uint size() const { return list.size(); }
   inline Enumerant operator[](uint index) const { return Enumerant(parent, index, list[index]); }
 
-  typedef internal::IndexingIterator<const EnumerantList, Enumerant> iterator;
-  inline iterator begin() const { return iterator(this, 0); }
-  inline iterator end() const { return iterator(this, size()); }
+  typedef internal::IndexingIterator<const EnumerantList, Enumerant> Iterator;
+  inline Iterator begin() const { return Iterator(this, 0); }
+  inline Iterator end() const { return Iterator(this, size()); }
 
 private:
   EnumSchema parent;
@@ -322,9 +322,9 @@ public:
   inline uint size() const { return list.size(); }
   inline Method operator[](uint index) const { return Method(parent, index, list[index]); }
 
-  typedef internal::IndexingIterator<const MethodList, Method> iterator;
-  inline iterator begin() const { return iterator(this, 0); }
-  inline iterator end() const { return iterator(this, size()); }
+  typedef internal::IndexingIterator<const MethodList, Method> Iterator;
+  inline Iterator begin() const { return Iterator(this, 0); }
+  inline Iterator end() const { return Iterator(this, size()); }
 
 private:
   InterfaceSchema parent;