re PR libstdc++/37144 (A bug in include/ext/pb_ds/detail/pat_trie_/constructors_destr...

[thirdparty/gcc.git] / libstdc++-v3 / include / ext / pb_ds / detail / left_child_next_sibling_heap_ / point_const_iterator.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
similarity index 82%
rename from libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
rename to libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
index 712a76fb7c0e9a585f5ff71d64e48a6cd0636ea1..5b29254f6aa9a03ce5579d061a0a5712c925b499 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
@@ -34,9 +34,9 @@
 // warranty.
 
 /**
- * @file const_point_iterator.hpp
+ * @file left_child_next_sibling_heap_/point_const_iterator.hpp
  * Contains an iterator class returned by the table's const find and insert
- *     methods.
+ * methods.
  */
 
 #ifndef PB_DS_LEFT_CHILD_NEXT_SIBLING_HEAP_CONST_FIND_ITERATOR_HPP
@@ -51,18 +51,18 @@ namespace __gnu_pbds
   {
 
 #define PB_DS_CLASS_T_DEC                      \
-    template<typename Node, class Allocator>
+    template<typename Node, typename _Alloc>
 
 #define PB_DS_CLASS_C_DEC \
-    left_child_next_sibling_heap_node_const_point_iterator_<Node, Allocator>
+    left_child_next_sibling_heap_node_point_const_iterator_<Node, _Alloc>
 
-    // Const point-type iterator.
-    template<typename Node, class Allocator>
-    class left_child_next_sibling_heap_node_const_point_iterator_
+    /// Const point-type iterator.
+    template<typename Node, typename _Alloc>
+    class left_child_next_sibling_heap_node_point_const_iterator_
     {
 
     protected:
-      typedef typename Allocator::template rebind<Node>::other::pointer node_pointer;
+      typedef typename _Alloc::template rebind<Node>::other::pointer node_pointer;
 
     public:
 
@@ -77,42 +77,42 @@ namespace __gnu_pbds
 
       // Iterator's pointer type.
       typedef
-      typename Allocator::template rebind<
+      typename _Alloc::template rebind<
        value_type>::other::pointer
       pointer;
 
       // Iterator's const pointer type.
       typedef
-      typename Allocator::template rebind<
+      typename _Alloc::template rebind<
        value_type>::other::const_pointer
       const_pointer;
 
       // Iterator's reference type.
       typedef
-      typename Allocator::template rebind<
+      typename _Alloc::template rebind<
        value_type>::other::reference
       reference;
 
       // Iterator's const reference type.
       typedef
-      typename Allocator::template rebind<
+      typename _Alloc::template rebind<
        value_type>::other::const_reference
       const_reference;
 
     public:
 
       inline
-      left_child_next_sibling_heap_node_const_point_iterator_(node_pointer p_nd) : m_p_nd(p_nd)
+      left_child_next_sibling_heap_node_point_const_iterator_(node_pointer p_nd) : m_p_nd(p_nd)
       { }
 
       // Default constructor.
       inline
-      left_child_next_sibling_heap_node_const_point_iterator_() : m_p_nd(0)
+      left_child_next_sibling_heap_node_point_const_iterator_() : m_p_nd(0)
       { }
 
       // Copy constructor.
       inline
-      left_child_next_sibling_heap_node_const_point_iterator_(const PB_DS_CLASS_C_DEC& other) : m_p_nd(other.m_p_nd)
+      left_child_next_sibling_heap_node_point_const_iterator_(const PB_DS_CLASS_C_DEC& other) : m_p_nd(other.m_p_nd)
       { }
 
       // Access.