[Boost-commit] svn:boost r50317 - branches/release/boost/graph

Subject: [Boost-commit] svn:boost r50317 - branches/release/boost/graph
From: asutton_at_[hidden]
Date: 2008-12-18 09:07:52

Author: asutton
Date: 2008-12-18 09:07:51 EST (Thu, 18 Dec 2008)
New Revision: 50317
URL: http://svn.boost.org/trac/boost/changeset/50317

Log:
Merging r48999, r49000 to fix #2209 and the use of MAXINT instead of
numeric_limits.

Text files modified: 
   branches/release/boost/graph/sloan_ordering.hpp   |    11 +++++------                             
   branches/release/boost/graph/topological_sort.hpp |     2 +-                                      
   2 files changed, 6 insertions(+), 7 deletions(-)

Modified: branches/release/boost/graph/sloan_ordering.hpp
==============================================================================
--- branches/release/boost/graph/sloan_ordering.hpp	(original)
+++ branches/release/boost/graph/sloan_ordering.hpp	2008-12-18 09:07:51 EST (Thu, 18 Dec 2008)
@@ -14,19 +14,18 @@
 
 #define WEIGHT1 1               //default weight for the distance in the Sloan algorithm
 #define WEIGHT2 2               //default weight for the degree in the Sloan algorithm
-#define MAXINT 2147483647       //Maximum value for a 32bit integer
 
 #include <boost/config.hpp>
 #include <vector>
 #include <queue>
+#include <algorithm>
+#include <limits>
 #include <boost/pending/queue.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/breadth_first_search.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/pending/indirect_cmp.hpp>
 #include <boost/property_map.hpp>
-#include <algorithm>
-#include <utility>
 #include <boost/graph/visitors.hpp>
 #include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/cuthill_mckee_ordering.hpp>
@@ -195,9 +194,9 @@
       //end 3 & 4
 
       
-      //step 5
-      //Initializing w
-      w_e = MAXINT;
+      // step 5
+      // Initializing w
+      w_e = std::numeric_limits<unsigned>::max();
       //end 5
       
       

Modified: branches/release/boost/graph/topological_sort.hpp
==============================================================================
--- branches/release/boost/graph/topological_sort.hpp	(original)
+++ branches/release/boost/graph/topological_sort.hpp	2008-12-18 09:07:51 EST (Thu, 18 Dec 2008)
@@ -37,7 +37,7 @@
       : m_iter(_iter) { }
     
     template <typename Edge, typename Graph>
-    void back_edge(const Edge& u, Graph&) { throw not_a_dag(); }
+    void back_edge(const Edge&, Graph&) { throw not_a_dag(); }
     
     template <typename Vertex, typename Graph> 
     void finish_vertex(const Vertex& u, Graph&) { *m_iter++ = u; }