[Boost-commit] svn:boost r65385 - in trunk/boost/graph: . detail

Subject: [Boost-commit] svn:boost r65385 - in trunk/boost/graph: . detail
From: asutton_at_[hidden]
Date: 2010-09-11 10:05:43

Author: asutton
Date: 2010-09-11 10:05:41 EDT (Sat, 11 Sep 2010)
New Revision: 65385
URL: http://svn.boost.org/trac/boost/changeset/65385

Log:
Fixing #4642.

Added a deprecation warning to to pending/integer_range.hpp. Replaced all
BGL inclusions with range/irange, which defines the same type.

Text files modified: 
   trunk/boost/graph/adjacency_matrix.hpp      |     2 +-                                      
   trunk/boost/graph/detail/adjacency_list.hpp |     2 +-                                      
   trunk/boost/graph/edge_list.hpp             |    40 ++++++++++++++++++++--------------------
   trunk/boost/graph/vector_as_graph.hpp       |     6 +++---                                  
   4 files changed, 25 insertions(+), 25 deletions(-)

Modified: trunk/boost/graph/adjacency_matrix.hpp
==============================================================================
--- trunk/boost/graph/adjacency_matrix.hpp	(original)
+++ trunk/boost/graph/adjacency_matrix.hpp	2010-09-11 10:05:41 EDT (Sat, 11 Sep 2010)
@@ -25,7 +25,7 @@
 #include <boost/graph/detail/edge.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/filter_iterator.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/static_assert.hpp>

Modified: trunk/boost/graph/detail/adjacency_list.hpp
==============================================================================
--- trunk/boost/graph/detail/adjacency_list.hpp	(original)
+++ trunk/boost/graph/detail/adjacency_list.hpp	2010-09-11 10:05:41 EDT (Sat, 11 Sep 2010)
@@ -17,7 +17,7 @@
 #include <boost/detail/workaround.hpp>
 #include <boost/operators.hpp>
 #include <boost/property_map/property_map.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <memory>
 #include <algorithm>

Modified: trunk/boost/graph/edge_list.hpp
==============================================================================
--- trunk/boost/graph/edge_list.hpp	(original)
+++ trunk/boost/graph/edge_list.hpp	2010-09-11 10:05:41 EDT (Sat, 11 Sep 2010)
@@ -15,7 +15,7 @@
 #include <boost/config.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/pending/integer_range.hpp>
+#include <boost/range/irange.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 
@@ -37,7 +37,7 @@
   // If the iterators are random access, then Graph::edge_descriptor
   // is of Integral type, otherwise it is a struct, though it is
   // convertible to an Integral type.
-  // 
+  //
 
   struct edge_list_tag { };
 
@@ -129,7 +129,7 @@
       typedef type const_type;
     };
   };
-  template <>  
+  template <>
   struct edge_property_selector<edge_list_tag> {
     typedef edge_list_edge_property_selector type;
   };
@@ -137,7 +137,7 @@
   template <class G, class EI, class T, class D>
   typename property_map< edge_list_impl<G,EI,T,D>, edge_index_t>::type
   get(edge_index_t, const edge_list_impl<G,EI,T,D>&) {
-    typedef typename property_map< edge_list_impl<G,EI,T,D>, 
+    typedef typename property_map< edge_list_impl<G,EI,T,D>,
       edge_index_t>::type EdgeIndexMap;
     return EdgeIndexMap();
   }
@@ -180,7 +180,7 @@
     const G& g = static_cast<const G&>(g_);
     typedef typename edge_list_impl_ra<G,EI,T,D>::edge_iterator edge_iterator;
     return std::make_pair(edge_iterator(0), edge_iterator(g._last - g._first));
-  }    
+  }
   template <class G, class EI, class T, class D>
   typename edge_list_impl_ra<G,EI,T,D>::vertex_descriptor
   source(typename edge_list_impl_ra<G,EI,T,D>::edge_descriptor e,
@@ -217,22 +217,22 @@
       typedef type const_type;
     };
   };
-  template <>  
+  template <>
   struct edge_property_selector<edge_list_ra_tag> {
     typedef edge_list_ra_edge_property_selector type;
   };
   template <class G, class EI, class T, class D>
-  inline 
+  inline
   typename property_map< edge_list_impl_ra<G,EI,T,D>, edge_index_t>::type
   get(edge_index_t, const edge_list_impl_ra<G,EI,T,D>&) {
-    typedef typename property_map< edge_list_impl_ra<G,EI,T,D>, 
+    typedef typename property_map< edge_list_impl_ra<G,EI,T,D>,
       edge_index_t>::type EdgeIndexMap;
     return EdgeIndexMap();
   }
 
   template <class G, class EI, class T, class D>
   inline D
-  get(edge_index_t, const edge_list_impl_ra<G,EI,T,D>&, 
+  get(edge_index_t, const edge_list_impl_ra<G,EI,T,D>&,
       typename edge_list_impl_ra<G,EI,T,D>::edge_descriptor e) {
     return e;
   }
@@ -241,31 +241,31 @@
   // Some helper classes for determining if the iterators are random access
   template <class Cat>
   struct is_random {
-    enum { RET = false }; 
-    typedef mpl::false_ type; 
+    enum { RET = false };
+    typedef mpl::false_ type;
   };
   template <>
-  struct is_random<std::random_access_iterator_tag> { 
-    enum { RET = true }; typedef mpl::true_ type; 
+  struct is_random<std::random_access_iterator_tag> {
+    enum { RET = true }; typedef mpl::true_ type;
   };
 
   // The edge_list class conditionally inherits from one of the
   // above two classes.
 
-  template <class EdgeIter, 
+  template <class EdgeIter,
 #if !defined BOOST_NO_STD_ITERATOR_TRAITS
             class T = typename std::iterator_traits<EdgeIter>::value_type,
             class D = typename std::iterator_traits<EdgeIter>::difference_type,
             class Cat = typename std::iterator_traits<EdgeIter>::iterator_category>
 #else
             class T,
-            class D, 
+            class D,
             class Cat>
 #endif
   class edge_list
     : public mpl::if_< typename is_random<Cat>::type,
                     edge_list_impl_ra< edge_list<EdgeIter,T,D,Cat>, EdgeIter,T,D>,
-                    edge_list_impl< edge_list<EdgeIter,T,D,Cat>, EdgeIter,T,D> 
+                    edge_list_impl< edge_list<EdgeIter,T,D,Cat>, EdgeIter,T,D>
              >::type
   {
   public:
@@ -275,12 +275,12 @@
     typedef std::size_t edges_size_type;
     typedef std::size_t vertices_size_type;
     typedef std::size_t degree_size_type;
-    edge_list(EdgeIter first, EdgeIter last) : _first(first), _last(last) { 
+    edge_list(EdgeIter first, EdgeIter last) : _first(first), _last(last) {
       m_num_edges = std::distance(first, last);
     }
     edge_list(EdgeIter first, EdgeIter last, edges_size_type E)
-      : _first(first), _last(last), m_num_edges(E) { }  
-    
+      : _first(first), _last(last), m_num_edges(E) { }
+
     EdgeIter _first, _last;
     edges_size_type m_num_edges;
   };
@@ -298,7 +298,7 @@
     return edge_list<EdgeIter>(first, last);
   }
 #endif
-  
+
 } /* namespace boost */
 
 #endif /* BOOST_GRAPH_EDGE_LIST_HPP */

Modified: trunk/boost/graph/vector_as_graph.hpp
==============================================================================
--- trunk/boost/graph/vector_as_graph.hpp	(original)
+++ trunk/boost/graph/vector_as_graph.hpp	2010-09-11 10:05:41 EDT (Sat, 11 Sep 2010)
@@ -19,8 +19,8 @@
 #include <vector>
 #include <cstddef>
 #include <boost/iterator.hpp>
+#include <boost/range/irange.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/pending/integer_range.hpp>
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/properties.hpp>
 #include <algorithm>
@@ -315,14 +315,14 @@
   };
 
   template<typename EdgeList, typename Allocator>
-  identity_property_map 
+  identity_property_map
   get(vertex_index_t, const std::vector<EdgeList, Allocator>&)
   {
     return identity_property_map();
   }
 
   template<typename EdgeList, typename Allocator>
-  identity_property_map 
+  identity_property_map
   get(vertex_index_t, std::vector<EdgeList, Allocator>&)
   {
     return identity_property_map();