2011-05-23 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / ext / pb_ds / detail / binary_heap_ / const_iterator.hpp

diff --git a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
index aa86f5e..a6ac261 100644 (file)
--- a/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+++ b/libstdc++-v3/include/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
@@ -34,7 +34,7 @@
 // warranty.
 
 /**
- * @file const_iterator.hpp
+ * @file binary_heap_/const_iterator.hpp
  * Contains an iterator class returned by the table's const find and insert
  *     methods.
  */
@@ -42,57 +42,48 @@
 #ifndef PB_DS_BINARY_HEAP_CONST_ITERATOR_HPP
 #define PB_DS_BINARY_HEAP_CONST_ITERATOR_HPP
 
-#include <ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp>
+#include <ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp>
 #include <debug/debug.h>
 
 namespace __gnu_pbds
 {
   namespace detail
   {
+#define PB_DS_BIN_HEAP_CIT_BASE \
+    binary_heap_point_const_iterator_<Value_Type, Entry, Simple, _Alloc>
 
-#define PB_DS_CLASS_C_DEC \
-    binary_heap_const_iterator_<Value_Type, Entry, Simple, Allocator>
-
-#define PB_DS_BASE_C_DEC \
-    binary_heap_const_point_iterator_<Value_Type, Entry, Simple, Allocator>
-
-    // Const point-type iterator.
+    /// Const point-type iterator.
     template<typename Value_Type,
             typename Entry,
             bool Simple,
-            class Allocator>
-    class binary_heap_const_iterator_ : public PB_DS_BASE_C_DEC
+            typename _Alloc>
+    class binary_heap_const_iterator_ : public PB_DS_BIN_HEAP_CIT_BASE
     {
-
     private:
-      typedef typename PB_DS_BASE_C_DEC::entry_pointer entry_pointer;
-
-      typedef PB_DS_BASE_C_DEC base_type;
+      typedef PB_DS_BIN_HEAP_CIT_BASE                  base_type;
+      typedef typename base_type::entry_pointer        entry_pointer;
 
     public:
-
       // Category.
-      typedef std::forward_iterator_tag iterator_category;
+      typedef std::forward_iterator_tag                iterator_category;
 
       // Difference type.
-      typedef typename Allocator::difference_type difference_type;
+      typedef typename _Alloc::difference_type                 difference_type;
 
       // Iterator's value type.
-      typedef typename base_type::value_type value_type;
+      typedef typename base_type::value_type           value_type;
 
       // Iterator's pointer type.
-      typedef typename base_type::pointer pointer;
+      typedef typename base_type::pointer              pointer;
 
       // Iterator's const pointer type.
-      typedef typename base_type::const_pointer const_pointer;
+      typedef typename base_type::const_pointer        const_pointer;
 
       // Iterator's reference type.
-      typedef typename base_type::reference reference;
+      typedef typename base_type::reference            reference;
 
       // Iterator's const reference type.
-      typedef typename base_type::const_reference const_reference;
-
-    public:
+      typedef typename base_type::const_reference      const_reference;
 
       inline
       binary_heap_const_iterator_(entry_pointer p_e) : base_type(p_e)
@@ -105,24 +96,21 @@ namespace __gnu_pbds
 
       // Copy constructor.
       inline
-      binary_heap_const_iterator_(const PB_DS_CLASS_C_DEC& other) : base_type(other)
+      binary_heap_const_iterator_(const binary_heap_const_iterator_& other) 
+      : base_type(other)
       { }
 
       // Compares content to a different iterator object.
       inline bool
-      operator==(const PB_DS_CLASS_C_DEC& other) const
-      {
-       return base_type::m_p_e == other.m_p_e;
-      }
+      operator==(const binary_heap_const_iterator_& other) const
+      { return base_type::m_p_e == other.m_p_e; }
 
       // Compares content (negatively) to a different iterator object.
       inline bool
-      operator!=(const PB_DS_CLASS_C_DEC& other) const
-      {
-       return base_type::m_p_e != other.m_p_e;
-      }
+      operator!=(const binary_heap_const_iterator_& other) const
+      { return base_type::m_p_e != other.m_p_e; }
 
-      inline PB_DS_CLASS_C_DEC& 
+      inline binary_heap_const_iterator_& 
       operator++()
       {
        _GLIBCXX_DEBUG_ASSERT(base_type::m_p_e != 0);
@@ -130,10 +118,10 @@ namespace __gnu_pbds
        return *this;
       }
 
-      inline PB_DS_CLASS_C_DEC
+      inline binary_heap_const_iterator_
       operator++(int)
       {
-       PB_DS_CLASS_C_DEC ret_it(base_type::m_p_e);
+       binary_heap_const_iterator_ ret_it(base_type::m_p_e);
        operator++();
        return ret_it;
       }
@@ -144,8 +132,7 @@ namespace __gnu_pbds
       { ++base_type::m_p_e; }
     };
 
-#undef PB_DS_CLASS_C_DEC
-#undef PB_DS_BASE_C_DEC
+#undef PB_DS_BIN_HEAP_CIT_BASE
   } // namespace detail
 } // namespace __gnu_pbds