graphviz-gcc34.patch

   1 --- graphviz-1.10/dynagraph/common/traversal.h.orig     2002-12-19 23:30:25.000000000 +0100
   2 +++ graphviz-1.10/dynagraph/common/traversal.h  2004-02-23 10:33:01.743594216 +0100
   3 @@ -78,10 +78,10 @@
   4         }
   5         DFS &operator++() {
   6                 if(m_curr.e)
   7 -                       gd<Hit>(m_curr.e)[m_hitpos] = true;
   8 +                       gd<Hit>(m_curr.e)[this->m_hitpos] = true;
   9                 else {
  10                         assert(m_curr.n);
  11 -                       gd<Hit>(m_curr.n)[m_hitpos] = true;
  12 +                       gd<Hit>(m_curr.n)[this->m_hitpos] = true;
  13                 }
  14                 // try edges
  15                 if(m_curr.n && follow())
  16 @@ -143,10 +143,10 @@
  17         }
  18         bool outs(typename G::outedge_iter start) {
  19                 for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei)
  20 -                       if(!gd<Hit>(*ei)[m_hitpos]) {
  21 +                       if(!gd<Hit>(*ei)[this->m_hitpos]) {
  22                                 m_stack.push(m_curr);
  23                                 m_curr.e = *ei;
  24 -                               if(!gd<Hit>(m_curr.e->head)[m_hitpos])
  25 +                               if(!gd<Hit>(m_curr.e->head)[this->m_hitpos])
  26                                         m_curr.n = m_curr.e->head;
  27                                 else
  28                                         m_curr.n = 0;
  29 @@ -156,10 +156,10 @@
  30         }
  31         bool ins(typename G::inedge_iter start) {
  32                 for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei)
  33 -                       if(!gd<Hit>(*ei)[m_hitpos]) {
  34 +                       if(!gd<Hit>(*ei)[this->m_hitpos]) {
  35                                 m_stack.push(m_curr);
  36                                 m_curr.e = *ei;
  37 -                               if(!gd<Hit>(m_curr.e->tail)[m_hitpos])
  38 +                               if(!gd<Hit>(m_curr.e->tail)[this->m_hitpos])
  39                                         m_curr.n = m_curr.e->tail;
  40                                 else
  41                                         m_curr.n = 0;
  42 @@ -180,8 +180,8 @@
  43                 return true;
  44         }
  45         bool next() {
  46 -               for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter)
  47 -                       if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
  48 +               for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter)
  49 +                       if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
  50                                 m_curr.e = 0;
  51                                 m_curr.n = *m_nodeiter;
  52                                 m_nodeiter++;
  53 @@ -205,31 +205,31 @@
  54                 if(last.n) {
  55                         if(m_inwards)
  56                                 for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei)
  57 -                                       if(!gd<Hit>(*ei)[m_hitpos]) {
  58 +                                       if(!gd<Hit>(*ei)[this->m_hitpos]) {
  59                                                 Node *t = (*ei)->tail;
  60 -                                               if(gd<Hit>(t)[m_hitpos])
  61 +                                               if(gd<Hit>(t)[this->m_hitpos])
  62                                                         t = 0;
  63                                                 else
  64 -                                                       gd<Hit>(t)[m_hitpos] = true;
  65 +                                                       gd<Hit>(t)[this->m_hitpos] = true;
  66                                                 m_queue.push(V(*ei,t));
  67 -                                               gd<Hit>(*ei)[m_hitpos] = true;
  68 +                                               gd<Hit>(*ei)[this->m_hitpos] = true;
  69                                         }
  70                         if(m_outwards)
  71                                 for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei)
  72 -                                       if(!gd<Hit>(*ei)[m_hitpos]) {
  73 +                                       if(!gd<Hit>(*ei)[this->m_hitpos]) {
  74                                                 Node *h = (*ei)->head;
  75 -                                               if(gd<Hit>(h)[m_hitpos])
  76 +                                               if(gd<Hit>(h)[this->m_hitpos])
  77                                                         h = 0;
  78                                                 else
  79 -                                                       gd<Hit>(h)[m_hitpos] = true;
  80 +                                                       gd<Hit>(h)[this->m_hitpos] = true;
  81                                                 m_queue.push(V(*ei,h));
  82 -                                               gd<Hit>(*ei)[m_hitpos] = true;
  83 +                                               gd<Hit>(*ei)[this->m_hitpos] = true;
  84                                         }
  85                 }
  86                 if(m_queue.empty())
  87 -                       for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter)
  88 -                               if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
  89 -                                       gd<Hit>(*m_nodeiter)[m_hitpos] = true;
  90 +                       for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter)
  91 +                               if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
  92 +                                       gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
  93                                         m_queue.push(V(0,*m_nodeiter++));
  94                                         break;
  95                                 }
  96 @@ -241,7 +241,7 @@
  97         BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal<G>(g),m_inwards(inwards),m_outwards(outwards) {
  98                 m_nodeiter = start?g->iter(start):g->nodes().begin();
  99                 if(m_nodeiter!=g->nodes().end()) {
 100 -                       gd<Hit>(*m_nodeiter)[m_hitpos] = true;
 101 +                       gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
 102                         m_queue.push(V(0,*m_nodeiter++));
 103                 }
 104         }