update boost

linx64/include/boost/graph/adjacency_iterator.hpp

@@ -10,93 +10,84 @@
 #ifndef BOOST_ADJACENCY_ITERATOR_HPP
 #define BOOST_ADJACENCY_ITERATOR_HPP
 
-#include <boost/detail/iterator.hpp>
+#include <iterator>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/graph/graph_traits.hpp>
 
 namespace boost
 {
 
-  template <class Graph, class Vertex, class OutEdgeIter, class Difference>
-  struct adjacency_iterator
-    : iterator_adaptor<
-          adjacency_iterator<Graph,Vertex,OutEdgeIter,Difference>
-        , OutEdgeIter
-        , Vertex
-        , use_default
-        , Vertex
-        , Difference
-      >
-  {
-      typedef iterator_adaptor<
-          adjacency_iterator<Graph,Vertex,OutEdgeIter,Difference>
-        , OutEdgeIter
-        , Vertex
-        , use_default
-        , Vertex
-        , Difference
-      > super_t;
-      
-      inline adjacency_iterator() {}
-      inline adjacency_iterator(OutEdgeIter const& i, const Graph* g) : super_t(i), m_g(g) { }
+template < class Graph, class Vertex, class OutEdgeIter, class Difference >
+struct adjacency_iterator
+: iterator_adaptor<
+      adjacency_iterator< Graph, Vertex, OutEdgeIter, Difference >, OutEdgeIter,
+      Vertex, use_default, Vertex, Difference >
+{
+    typedef iterator_adaptor<
+        adjacency_iterator< Graph, Vertex, OutEdgeIter, Difference >,
+        OutEdgeIter, Vertex, use_default, Vertex, Difference >
+        super_t;
 
-      inline Vertex
-      dereference() const
-        { return target(*this->base(), *m_g); }
-
-      const Graph* m_g;
-  };
-
-  template <class Graph,
-            class Vertex = typename graph_traits<Graph>::vertex_descriptor,
-            class OutEdgeIter=typename graph_traits<Graph>::out_edge_iterator>
-  class adjacency_iterator_generator
-  {
-    typedef typename boost::detail::iterator_traits<OutEdgeIter>
-      ::difference_type difference_type;
-  public:
-      typedef adjacency_iterator<Graph,Vertex,OutEdgeIter,difference_type> type;
-  };
-
-  template <class Graph, class Vertex, class InEdgeIter, class Difference>
-  struct inv_adjacency_iterator
-    : iterator_adaptor<
-          inv_adjacency_iterator<Graph,Vertex,InEdgeIter,Difference>
-        , InEdgeIter
-        , Vertex
-        , use_default
-        , Vertex
-        , Difference
-      >
+    inline adjacency_iterator() {}
+    inline adjacency_iterator(OutEdgeIter const& i, const Graph* g)
+    : super_t(i), m_g(g)
     {
-      typedef iterator_adaptor<
-                  inv_adjacency_iterator<Graph,Vertex,InEdgeIter,Difference>
-                , InEdgeIter
-                , Vertex
-                , use_default
-                , Vertex
-                , Difference
-              > super_t;
+    }
 
-      inline inv_adjacency_iterator() { }
-      inline inv_adjacency_iterator(InEdgeIter const& i, const Graph* g) : super_t(i), m_g(g) { }
+    inline Vertex dereference() const { return target(*this->base(), *m_g); }
 
-      inline Vertex
-      dereference() const
-        { return source(*this->base(), *m_g); }
+    const Graph* m_g;
+};
 
-      const Graph* m_g;
-    };
+template < class Graph,
+    class Vertex = typename graph_traits< Graph >::vertex_descriptor,
+    class OutEdgeIter = typename graph_traits< Graph >::out_edge_iterator >
+class adjacency_iterator_generator
+{
+    typedef
+        typename std::iterator_traits< OutEdgeIter >::difference_type
+            difference_type;
 
-  template <class Graph,
-            class Vertex = typename graph_traits<Graph>::vertex_descriptor,
-            class InEdgeIter = typename graph_traits<Graph>::in_edge_iterator>
-  class inv_adjacency_iterator_generator {
-    typedef typename boost::detail::iterator_traits<InEdgeIter>
-      ::difference_type difference_type;
-  public:
-      typedef inv_adjacency_iterator<Graph, Vertex, InEdgeIter, difference_type> type;
-  };
+public:
+    typedef adjacency_iterator< Graph, Vertex, OutEdgeIter, difference_type >
+        type;
+};
+
+template < class Graph, class Vertex, class InEdgeIter, class Difference >
+struct inv_adjacency_iterator
+: iterator_adaptor<
+      inv_adjacency_iterator< Graph, Vertex, InEdgeIter, Difference >,
+      InEdgeIter, Vertex, use_default, Vertex, Difference >
+{
+    typedef iterator_adaptor<
+        inv_adjacency_iterator< Graph, Vertex, InEdgeIter, Difference >,
+        InEdgeIter, Vertex, use_default, Vertex, Difference >
+        super_t;
+
+    inline inv_adjacency_iterator() {}
+    inline inv_adjacency_iterator(InEdgeIter const& i, const Graph* g)
+    : super_t(i), m_g(g)
+    {
+    }
+
+    inline Vertex dereference() const { return source(*this->base(), *m_g); }
+
+    const Graph* m_g;
+};
+
+template < class Graph,
+    class Vertex = typename graph_traits< Graph >::vertex_descriptor,
+    class InEdgeIter = typename graph_traits< Graph >::in_edge_iterator >
+class inv_adjacency_iterator_generator
+{
+    typedef
+        typename std::iterator_traits< InEdgeIter >::difference_type
+            difference_type;
+
+public:
+    typedef inv_adjacency_iterator< Graph, Vertex, InEdgeIter, difference_type >
+        type;
+};
 
 } // namespace boost