boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-09 11:12:28 +00:00
Code Issues Projects Releases Wiki Activity

boost/graph/{king_ordering,cuthill_mckee_ordering}.hpp: Fix for typedef conflict with DS macro on Solaris

Browse Source 
[SVN r34355]
This commit is contained in:
Caleb Epstein
2006-06-19 14:49:21 +00:00
parent 05a7299c0e
commit 1b468cb8aa
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/graph/cuthill_mckee_ordering.hpp
View File

@@ -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;

8
include/boost/graph/king_ordering.hpp
View File

@@ -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;