--- graphviz-1.10/dynagraph/dynadag/DynaDAG.h.orig 2002-12-19 23:30:25.000000000 +0100 +++ graphviz-1.10/dynagraph/dynadag/DynaDAG.h 2004-02-23 12:42:39.206240176 +0100 @@ -209,10 +209,10 @@ typename Chain::edge_iter ei; }; node_iter nBegin() { - return node_iter(eBegin(),false); + return node_iter(this->eBegin(),false); } node_iter nEnd() { - return node_iter(eEnd(),true); + return node_iter(this->eEnd(),true); } Position pos() { if(!top() || !DDd(top()).cur.valid) @@ -220,10 +220,10 @@ return Position(DDd(top()).cur.x,(DDd(top()).cur.y+DDd(bottom()).cur.y)/2.0); } N *top() { - return node?node:first->tail; + return node?node:this->first->tail; } N *bottom() { - return node?node:last->head; + return node?node:this->last->head; } int len() { int n=0; --- graphviz-1.10/dynagraph/common/emitGraph.h.orig 2003-01-31 06:46:44.000000000 +0100 +++ graphviz-1.10/dynagraph/common/emitGraph.h 2004-02-23 12:34:46.289134504 +0100 @@ -18,7 +18,7 @@ template void emitGraph(std::ostream &os,G *g) { os << "digraph " << mquote(gd(g)); - os << " {" << endl << "\tgraph "; + os << " {" << std::endl << "\tgraph "; emitAttrs(os,gd(g)); for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) { os << '\t' << mquote(gd(*ni)) << ' '; @@ -44,7 +44,7 @@ Name &gname = (ati!=gd(g).end())?ati->second:gd(g); os << "digraph " << mquote(gname); - os << " {" << endl << "\tgraph "; + os << " {" << std::endl << "\tgraph "; emitAttrs(os,gd(g)); for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) { StrAttrs::iterator ati = gd(*ni).find("label"); --- graphviz-1.10/dynagraph/common/LGraph-cdt.h.orig 2002-12-19 23:30:25.000000000 +0100 +++ graphviz-1.10/dynagraph/common/LGraph-cdt.h 2004-02-23 11:53:04.176513440 +0100 @@ -232,10 +232,10 @@ return !(*this==other); } inedge_iter inIter() { - return head()->inIter(this); + return this->head()->inIter(this); } outedge_iter outIter() { - return tail()->outIter(this); + return this->tail()->outIter(this); } }; // workaround for circular typing problems w/ friend decl: do not call! --- graphviz-1.10/dynagraph/common/StringDict.cpp.orig 2002-08-01 23:53:34.000000000 +0200 +++ graphviz-1.10/dynagraph/common/StringDict.cpp 2004-02-23 12:31:17.732839880 +0100 @@ -26,7 +26,7 @@ } refstr_t; static Dtdisc_t Refstrdisc = { - offsetof(refstr_t,s[0]), + ((refstr_t *)0)->s[0], 0, 0, ((Dtmake_f)0), @@ -63,7 +63,7 @@ if (s == NULL) return s; - key = (refstr_t*)(s - offsetof(refstr_t,s[0])); + key = (refstr_t*)(s - ((refstr_t *)0)->s[0]); r = (refstr_t*) dtsearch(dict,key); if (r) r->refcnt++; else { @@ -80,7 +80,7 @@ refstr_t *key,*r; if ((dict == NULL) || (s == NULL)) return; - key = (refstr_t*)(s - offsetof(refstr_t,s[0])); + key = (refstr_t*)(s - ((refstr_t *)0)->s[0]); r = (refstr_t*) dtsearch(dict,key); if (r) { @@ -95,6 +95,6 @@ void StringDict::ref(const char *s) { if(!s) return; - refstr_t *key = (refstr_t*)(s - offsetof(refstr_t,s[0])); + refstr_t *key = (refstr_t*)(s - ((refstr_t *)0)->s[0]); key->refcnt++; } --- graphviz-1.10/dynagraph/common/traversal.h.orig 2002-12-19 23:30:25.000000000 +0100 +++ graphviz-1.10/dynagraph/common/traversal.h 2004-02-23 10:33:01.743594216 +0100 @@ -78,10 +78,10 @@ } DFS &operator++() { if(m_curr.e) - gd(m_curr.e)[m_hitpos] = true; + gd(m_curr.e)[this->m_hitpos] = true; else { assert(m_curr.n); - gd(m_curr.n)[m_hitpos] = true; + gd(m_curr.n)[this->m_hitpos] = true; } // try edges if(m_curr.n && follow()) @@ -143,10 +143,10 @@ } bool outs(typename G::outedge_iter start) { for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei) - if(!gd(*ei)[m_hitpos]) { + if(!gd(*ei)[this->m_hitpos]) { m_stack.push(m_curr); m_curr.e = *ei; - if(!gd(m_curr.e->head)[m_hitpos]) + if(!gd(m_curr.e->head)[this->m_hitpos]) m_curr.n = m_curr.e->head; else m_curr.n = 0; @@ -156,10 +156,10 @@ } bool ins(typename G::inedge_iter start) { for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei) - if(!gd(*ei)[m_hitpos]) { + if(!gd(*ei)[this->m_hitpos]) { m_stack.push(m_curr); m_curr.e = *ei; - if(!gd(m_curr.e->tail)[m_hitpos]) + if(!gd(m_curr.e->tail)[this->m_hitpos]) m_curr.n = m_curr.e->tail; else m_curr.n = 0; @@ -180,8 +180,8 @@ return true; } bool next() { - for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter) - if(!gd(*m_nodeiter)[m_hitpos]) { + for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter) + if(!gd(*m_nodeiter)[this->m_hitpos]) { m_curr.e = 0; m_curr.n = *m_nodeiter; m_nodeiter++; @@ -205,31 +205,31 @@ if(last.n) { if(m_inwards) for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei) - if(!gd(*ei)[m_hitpos]) { + if(!gd(*ei)[this->m_hitpos]) { Node *t = (*ei)->tail; - if(gd(t)[m_hitpos]) + if(gd(t)[this->m_hitpos]) t = 0; else - gd(t)[m_hitpos] = true; + gd(t)[this->m_hitpos] = true; m_queue.push(V(*ei,t)); - gd(*ei)[m_hitpos] = true; + gd(*ei)[this->m_hitpos] = true; } if(m_outwards) for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei) - if(!gd(*ei)[m_hitpos]) { + if(!gd(*ei)[this->m_hitpos]) { Node *h = (*ei)->head; - if(gd(h)[m_hitpos]) + if(gd(h)[this->m_hitpos]) h = 0; else - gd(h)[m_hitpos] = true; + gd(h)[this->m_hitpos] = true; m_queue.push(V(*ei,h)); - gd(*ei)[m_hitpos] = true; + gd(*ei)[this->m_hitpos] = true; } } if(m_queue.empty()) - for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter) - if(!gd(*m_nodeiter)[m_hitpos]) { - gd(*m_nodeiter)[m_hitpos] = true; + for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter) + if(!gd(*m_nodeiter)[this->m_hitpos]) { + gd(*m_nodeiter)[this->m_hitpos] = true; m_queue.push(V(0,*m_nodeiter++)); break; } @@ -241,7 +241,7 @@ BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal(g),m_inwards(inwards),m_outwards(outwards) { m_nodeiter = start?g->iter(start):g->nodes().begin(); if(m_nodeiter!=g->nodes().end()) { - gd(*m_nodeiter)[m_hitpos] = true; + gd(*m_nodeiter)[this->m_hitpos] = true; m_queue.push(V(0,*m_nodeiter++)); } }