fix: hide iterator under iter namespace to avoid collision

Author: DorianBDev

src/Core/Primitive/QuadTreeDownIterator.h

@@ -27,7 +27,7 @@
 namespace degate
 {
     template<typename T>
-    class DownIterator : public iterator<std::forward_iterator_tag, T>
+    class DownIterator : public iter::iterator<std::forward_iterator_tag, T>
     {
     private:
         QuadTree<T>* node;

src/Core/Primitive/QuadTreeRegionIterator.h

@@ -35,7 +35,7 @@ namespace degate
     class QuadTree;
 
     template<typename T>
-    class RegionIterator : public iterator<std::forward_iterator_tag, T>
+    class RegionIterator : public iter::iterator<std::forward_iterator_tag, T>
     {
     private:
         QuadTree<T>* node;

src/Core/Utils/Iterator.h

@@ -26,34 +26,37 @@
 
 namespace degate
 {
-    /**
-     *  @brief  Common %iterator class.
-     *
-     *  This class does nothing but define nested typedefs.  %Iterator classes
-     *  can inherit from this class to save some work.  The typedefs are then
-     *  used in specializations and overloading.
-     *
-     *  In particular, there are no default implementations of requirements
-     *  such as @c operator++ and the like.  (How could there be?)
-     */
-    template<typename _Category,
-             typename _Tp,
-             typename _Distance = std::ptrdiff_t,
-             typename _Pointer = _Tp*,
-             typename _Reference = _Tp&>
-    struct iterator
+    namespace iter
     {
-        /// One of the @link iterator_tags tag types@endlink.
-        typedef _Category iterator_category;
-        /// The type "pointed to" by the iterator.
-        typedef _Tp value_type;
-        /// Distance between iterators is represented as this type.
-        typedef _Distance difference_type;
-        /// This type represents a pointer-to-value_type.
-        typedef _Pointer pointer;
-        /// This type represents a reference-to-value_type.
-        typedef _Reference reference;
-    };
+        /**
+         *  @brief  Common %iterator class.
+         *
+         *  This class does nothing but define nested typedefs.  %Iterator classes
+         *  can inherit from this class to save some work.  The typedefs are then
+         *  used in specializations and overloading.
+         *
+         *  In particular, there are no default implementations of requirements
+         *  such as @c operator++ and the like.  (How could there be?)
+         */
+        template<typename _Category,
+                 typename _Tp,
+                 typename _Distance = std::ptrdiff_t,
+                 typename _Pointer = _Tp*,
+                 typename _Reference = _Tp&>
+        struct iterator
+        {
+            /// One of the @link iterator_tags tag types@endlink.
+            typedef _Category iterator_category;
+            /// The type "pointed to" by the iterator.
+            typedef _Tp value_type;
+            /// Distance between iterators is represented as this type.
+            typedef _Distance difference_type;
+            /// This type represents a pointer-to-value_type.
+            typedef _Pointer pointer;
+            /// This type represents a reference-to-value_type.
+            typedef _Reference reference;
+        };
+    } // namespace iter
 } // namespace degate
 
 #endif