From 1b468cb8aa00af1e8f0bd4e9cec3c8b80f5f26ab Mon Sep 17 00:00:00 2001
From: Caleb Epstein <boost-bklyn@sneakemail.com>
Date: Mon, 19 Jun 2006 14:49:21 +0000
Subject: [PATCH] boost/graph/{king_ordering,cuthill_mckee_ordering}.hpp: Fix
 for typedef conflict with DS macro on Solaris

[SVN r34355]
---
 include/boost/graph/cuthill_mckee_ordering.hpp | 6 +++---
 include/boost/graph/king_ordering.hpp          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/graph/cuthill_mckee_ordering.hpp b/include/boost/graph/cuthill_mckee_ordering.hpp
index 6c9dfa9a..61336ab1 100644
--- a/include/boost/graph/cuthill_mckee_ordering.hpp
+++ b/include/boost/graph/cuthill_mckee_ordering.hpp
@@ -41,9 +41,9 @@ namespace boost {
       void finish_vertex(Vertex, Graph&) {
         using std::sort;
 
-        typedef typename property_traits<DegreeMap>::value_type DS;
+        typedef typename property_traits<DegreeMap>::value_type ds_type;
 
-        typedef indirect_cmp<DegreeMap, std::less<DS> > Compare;
+        typedef indirect_cmp<DegreeMap, std::less<ds_type> > Compare;
         Compare comp(degree);
                 
         sort(Qptr->begin()+index_begin, Qptr->end(), comp);
@@ -74,7 +74,7 @@ namespace boost {
   {
 
     //create queue, visitor...don't forget namespaces!
-    typedef typename property_traits<DegreeMap>::value_type DS;
+    typedef typename property_traits<DegreeMap>::value_type ds_type;
     typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
     typedef typename boost::sparse::sparse_ordering_queue<Vertex> queue;
     typedef typename detail::bfs_rcm_visitor<OutputIterator, queue, DegreeMap> Visitor;
diff --git a/include/boost/graph/king_ordering.hpp b/include/boost/graph/king_ordering.hpp
index c4ab9b00..dadd963f 100644
--- a/include/boost/graph/king_ordering.hpp
+++ b/include/boost/graph/king_ordering.hpp
@@ -193,18 +193,18 @@ namespace boost {
                 ColorMap color, DegreeMap degree,
                 VertexIndexMap index_map)
   {
-    typedef typename property_traits<DegreeMap>::value_type DS;
+    typedef typename property_traits<DegreeMap>::value_type ds_type;
     typedef typename property_traits<ColorMap>::value_type ColorValue;
     typedef color_traits<ColorValue> Color;
     typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-    typedef iterator_property_map<typename std::vector<DS>::iterator, VertexIndexMap, DS, DS&> PseudoDegreeMap;
-    typedef indirect_cmp<PseudoDegreeMap, std::less<DS> > Compare;
+    typedef iterator_property_map<typename std::vector<ds_type>::iterator, VertexIndexMap, ds_type, ds_type&> PseudoDegreeMap;
+    typedef indirect_cmp<PseudoDegreeMap, std::less<ds_type> > Compare;
     typedef typename boost::sparse::sparse_ordering_queue<Vertex> queue;
     typedef typename detail::bfs_king_visitor<OutputIterator, queue, Compare,             
       PseudoDegreeMap, std::vector<int>, VertexIndexMap > Visitor;
     typedef typename graph_traits<Graph>::vertices_size_type
       vertices_size_type;
-    std::vector<DS> pseudo_degree_vec(num_vertices(g));
+    std::vector<ds_type> pseudo_degree_vec(num_vertices(g));
     PseudoDegreeMap pseudo_degree(pseudo_degree_vec.begin(), index_map);
     
     typename graph_traits<Graph>::vertex_iterator ui, ui_end;