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 / binary_heap_ / point_const_iterator.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
similarity index 80%
rename from libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
rename to libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
index 3d75e86d45a7e3759cc2785d6d1ab7e042ed9735..873626073878368362ee47b6ba41a68cb0efe8a6 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
@@ -34,9 +34,9 @@
 // warranty.
 
 /**
- * @file const_point_iterator.hpp
+ * @file binary_heap_/point_const_iterator.hpp
  * Contains an iterator class returned by the table's const find and insert
- *     methods.
+ * methods.
  */
 
 #ifndef PB_DS_BINARY_HEAP_CONST_FIND_ITERATOR_HPP
@@ -51,11 +51,11 @@ namespace __gnu_pbds
   {
     // Const point-type iterator.
     template<typename Value_Type, typename Entry, bool Simple, 
-            typename Allocator>
-    class binary_heap_const_point_iterator_
+            typename _Alloc>
+    class binary_heap_point_const_iterator_
     {
     protected:
-      typedef typename Allocator::template rebind<Entry>::other::pointer entry_pointer;
+      typedef typename _Alloc::template rebind<Entry>::other::pointer entry_pointer;
 
     public:
       // Category.
@@ -68,35 +68,35 @@ namespace __gnu_pbds
       typedef Value_Type value_type;
 
       // Iterator's pointer type.
-      typedef typename Allocator::template rebind<value_type>::other::pointer
+      typedef typename _Alloc::template rebind<value_type>::other::pointer
       pointer;
 
       // Iterator's const pointer type.
       typedef
-      typename Allocator::template rebind<value_type>::other::const_pointer
+      typename _Alloc::template rebind<value_type>::other::const_pointer
       const_pointer;
 
       // Iterator's reference type.
       typedef
-      typename Allocator::template rebind<value_type>::other::reference
+      typename _Alloc::template rebind<value_type>::other::reference
       reference;
 
       // Iterator's const reference type.
       typedef
-      typename Allocator::template rebind<value_type>::other::const_reference
+      typename _Alloc::template rebind<value_type>::other::const_reference
       const_reference;
 
       inline
-      binary_heap_const_point_iterator_(entry_pointer p_e) : m_p_e(p_e)
+      binary_heap_point_const_iterator_(entry_pointer p_e) : m_p_e(p_e)
       { }
 
       // Default constructor.
       inline
-      binary_heap_const_point_iterator_() : m_p_e(0) { }
+      binary_heap_point_const_iterator_() : m_p_e(0) { }
 
       // Copy constructor.
       inline
-      binary_heap_const_point_iterator_(const binary_heap_const_point_iterator_& other)
+      binary_heap_point_const_iterator_(const binary_heap_point_const_iterator_& other)
       : m_p_e(other.m_p_e)
       { }
 
@@ -118,12 +118,12 @@ namespace __gnu_pbds
 
       // Compares content to a different iterator object.
       inline bool
-      operator==(const binary_heap_const_point_iterator_& other) const
+      operator==(const binary_heap_point_const_iterator_& other) const
       { return m_p_e == other.m_p_e; }
 
       // Compares content (negatively) to a different iterator object.
       inline bool
-      operator!=(const binary_heap_const_point_iterator_& other) const
+      operator!=(const binary_heap_point_const_iterator_& other) const
       { return m_p_e != other.m_p_e; }
 
     private: