[Boost-commit] svn:boost r45938 - sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs

From: asutton_at_[hidden]
Date: 2008-05-30 08:07:51

Author: asutton
Date: 2008-05-30 08:07:50 EDT (Fri, 30 May 2008)
New Revision: 45938
URL: http://svn.boost.org/trac/boost/changeset/45938

Log:
Renamed the value iterator to simple iterator and propagated the fixes.

Added:
   sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/simple_vertex_iterator.hpp
      - copied unchanged from r45937, /sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp
Removed:
   sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp
Text files modified: 
   sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_list.hpp |     4 ++--                                    
   sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_set.hpp  |     4 ++--                                    
   2 files changed, 4 insertions(+), 4 deletions(-)

Deleted: sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp	2008-05-30 08:07:50 EDT (Fri, 30 May 2008)
+++ (empty file)
@@ -1,111 +0,0 @@
-
-#ifndef BOOST_GRAPHS_ADJACENCY_LIST_SIMPLE_VERTEX_ITERATOR_HPP
-#define BOOST_GRAPHS_ADJACENCY_LIST_SIMPLE_VERTEX_ITERATOR_HPP
-
-#include <iterator>
-
-namespace boost {
-namespace graphs {
-namespace adj_list {
-
-/**
- * The value vertex iterator provides a vertex iterator unique associative
- * containers and sequences that don't invalidate memory on insertions
- * (lists).
- */
-template <typename Store>
-class simple_vertex_iterator
-{
-    typedef typename Store::const_iterator iterator;
-public:
-    typedef typename Store::value_type vertex_type;
-    typedef typename vertex_type::descriptor_type vertex_descriptor;
-
-    typedef typename iterator::iterator_category iterator_category;
-    typedef typename iterator::difference_type difference_type;
-    typedef vertex_descriptor value_type;
-    typedef vertex_descriptor reference;
-    typedef vertex_descriptor pointer;
-
-    inline simple_vertex_iterator();
-    inline simple_vertex_iterator(simple_vertex_iterator const& x);
-    inline simple_vertex_iterator(iterator const& x);
-
-    inline simple_vertex_iterator& operator=(simple_vertex_iterator const& x);
-    inline simple_vertex_iterator& operator++();
-    inline simple_vertex_iterator& operator--();
-
-    inline reference operator*();
-
-    inline bool operator==(simple_vertex_iterator const& x) const;
-    inline bool operator!=(simple_vertex_iterator const& x) const;
-
-private:
-    iterator iter;
-};
-
-template <typename S>
-simple_vertex_iterator<S>::simple_vertex_iterator()
-    : iter()
-{ }
-
-template <typename S>
-simple_vertex_iterator<S>::simple_vertex_iterator(simple_vertex_iterator const& x)
-    : iter(x.iter)
-{ }
-
-template <typename S>
-simple_vertex_iterator<S>::simple_vertex_iterator(iterator const& x)
-    : iter(x)
-{ }
-
-template <typename S>
-simple_vertex_iterator<S>&
-simple_vertex_iterator<S>::operator=(simple_vertex_iterator const& x)
-{
-    iter = x.iter;
-    return *this;
-}
-
-template <typename S>
-simple_vertex_iterator<S>&
-simple_vertex_iterator<S>::operator++()
-{
-    ++iter;
-    return *this;
-}
-
-template <typename S>
-simple_vertex_iterator<S>&
-simple_vertex_iterator<S>::operator--()
-{
-    --iter;
-    return *this;
-}
-
-template <typename S>
-typename simple_vertex_iterator<S>::reference
-simple_vertex_iterator<S>::operator*()
-{
-    return &const_cast<vertex_type&>(*iter);
-}
-
-template <typename S>
-bool
-simple_vertex_iterator<S>::operator==(simple_vertex_iterator const& x) const
-{
-    return iter == x.iter;
-}
-
-template <typename S>
-bool
-simple_vertex_iterator<S>::operator!=(simple_vertex_iterator const& x) const
-{
-    return iter != x.iter;
-}
-
-} /* namespace adj_list */
-} /* namespace graphs */
-} /* namespace boost */
-
-#endif

Modified: sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_list.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_list.hpp	(original)
+++ sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_list.hpp	2008-05-30 08:07:50 EDT (Fri, 30 May 2008)
@@ -4,7 +4,7 @@
 
 #include <list>
 
-#include <boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp>
+#include <boost/graphs/adjacency_list/vs/simple_vertex_iterator.hpp>
 
 namespace boost {
 namespace graphs {
@@ -56,7 +56,7 @@
     typedef typename vertex_type::properties_type vertex_properties;
 
     typedef std::list<vertex_type, Alloc<vertex_type> > vertex_store;
-    typedef value_vertex_iterator<vertex_store> vertex_iterator;
+    typedef simple_vertex_iterator<vertex_store> vertex_iterator;
     typedef typename vertex_store::size_type vertices_size_type;
 
     // FIXME: Clearly, this should go away during conceptization.

Modified: sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_set.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_set.hpp	(original)
+++ sandbox/SOC/2008/graphs/boost/graphs/adjacency_list/vs/vertex_set.hpp	2008-05-30 08:07:50 EDT (Fri, 30 May 2008)
@@ -6,7 +6,7 @@
 #include <tr1/unordered_map>
 
 #include <boost/graphs/properties.hpp>
-#include <boost/graphs/adjacency_list/vs/value_vertex_iterator.hpp>
+#include <boost/graphs/adjacency_list/vs/simple_vertex_iterator.hpp>
 
 namespace boost {
 namespace graphs {
@@ -73,7 +73,7 @@
     typedef std::set<
             vertex_type, Compare<vertex_type>, Alloc<vertex_type>
         > vertex_store;
-    typedef value_vertex_iterator<vertex_store> vertex_iterator;
+    typedef simple_vertex_iterator<vertex_store> vertex_iterator;
     typedef typename vertex_store::size_type vertices_size_type;
 
     // This is kind of hack, but we need some way of communicating a preference