]> git.pld-linux.org Git - packages/graphviz.git/blame - graphviz-gcc34.patch
projects / packages / graphviz.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- always use system gd, added missing libsvg-cairo deps (for gvrender)
[packages/graphviz.git] / graphviz-gcc34.patch
CommitLineData
047b3fd7
PS		 1--- graphviz-1.10/dynagraph/dynadag/DynaDAG.h.orig 2002-12-19 23:30:25.000000000 +0100
2+++ graphviz-1.10/dynagraph/dynadag/DynaDAG.h 2004-02-23 12:42:39.206240176 +0100
3@@ -209,10 +209,10 @@
4 typename Chain<N,E>::edge_iter ei;
5 };
6 node_iter nBegin() {
7- return node_iter(eBegin(),false);
8+ return node_iter(this->eBegin(),false);
9 }
10 node_iter nEnd() {
11- return node_iter(eEnd(),true);
12+ return node_iter(this->eEnd(),true);
13 }
14 Position pos() {
15 if(!top() || !DDd(top()).cur.valid)
16@@ -220,10 +220,10 @@
17 return Position(DDd(top()).cur.x,(DDd(top()).cur.y+DDd(bottom()).cur.y)/2.0);
18 }
19 N *top() {
20- return node?node:first->tail;
21+ return node?node:this->first->tail;
22 }
23 N *bottom() {
24- return node?node:last->head;
25+ return node?node:this->last->head;
26 }
27 int len() {
28 int n=0;
29--- graphviz-1.10/dynagraph/common/emitGraph.h.orig 2003-01-31 06:46:44.000000000 +0100
30+++ graphviz-1.10/dynagraph/common/emitGraph.h 2004-02-23 12:34:46.289134504 +0100
31@@ -18,7 +18,7 @@
32 template<typename G>
33 void emitGraph(std::ostream &os,G *g) {
34 os << "digraph " << mquote(gd<Name>(g));
35- os << " {" << endl << "\tgraph ";
36+ os << " {" << std::endl << "\tgraph ";
37 emitAttrs(os,gd<StrAttrs>(g));
38 for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
39 os << '\t' << mquote(gd<Name>(*ni)) << ' ';
40@@ -44,7 +44,7 @@
41 Name &gname = (ati!=gd<StrAttrs>(g).end())?ati->second:gd<Name>(g);
42
43 os << "digraph " << mquote(gname);
44- os << " {" << endl << "\tgraph ";
45+ os << " {" << std::endl << "\tgraph ";
46 emitAttrs(os,gd<StrAttrs>(g));
47 for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
48 StrAttrs::iterator ati = gd<StrAttrs>(*ni).find("label");
8e2edaca
PS		 49--- graphviz-1.10/dynagraph/common/LGraph-cdt.h.orig 2002-12-19 23:30:25.000000000 +0100
50+++ graphviz-1.10/dynagraph/common/LGraph-cdt.h 2004-02-23 11:53:04.176513440 +0100
51@@ -232,10 +232,10 @@
52 return !(*this==other);
53 }
54 inedge_iter inIter() {
55- return head()->inIter(this);
047b3fd7 56+ return this->head()->inIter(this);
8e2edaca
PS		 57 }
58 outedge_iter outIter() {
59- return tail()->outIter(this);
047b3fd7 60+ return this->tail()->outIter(this);
8e2edaca
PS		 61 }
62 };
63 // workaround for circular typing problems w/ friend decl: do not call!
23e76a63
PS		 64--- graphviz-1.10/dynagraph/common/StringDict.cpp.orig 2002-08-01 23:53:34.000000000 +0200
65+++ graphviz-1.10/dynagraph/common/StringDict.cpp 2004-02-23 12:31:17.732839880 +0100
66@@ -26,7 +26,7 @@
67 } refstr_t;
68
69 static Dtdisc_t Refstrdisc = {
70- offsetof(refstr_t,s[0]),
71+ ((refstr_t *)0)->s[0],
72 0,
73 0,
74 ((Dtmake_f)0),
75@@ -63,7 +63,7 @@
76
77 if (s == NULL) return s;
78
79- key = (refstr_t*)(s - offsetof(refstr_t,s[0]));
80+ key = (refstr_t*)(s - ((refstr_t *)0)->s[0]);
81 r = (refstr_t*) dtsearch(dict,key);
82 if (r) r->refcnt++;
83 else {
84@@ -80,7 +80,7 @@
85 refstr_t *key,*r;
86
87 if ((dict == NULL) || (s == NULL)) return;
88- key = (refstr_t*)(s - offsetof(refstr_t,s[0]));
89+ key = (refstr_t*)(s - ((refstr_t *)0)->s[0]);
90 r = (refstr_t*) dtsearch(dict,key);
91
92 if (r) {
93@@ -95,6 +95,6 @@
94 void StringDict::ref(const char *s) {
95 if(!s)
96 return;
97- refstr_t *key = (refstr_t*)(s - offsetof(refstr_t,s[0]));
98+ refstr_t *key = (refstr_t*)(s - ((refstr_t *)0)->s[0]);
99 key->refcnt++;
100 }
14a0ad44
PS		 101--- graphviz-1.10/dynagraph/common/traversal.h.orig 2002-12-19 23:30:25.000000000 +0100
102+++ graphviz-1.10/dynagraph/common/traversal.h 2004-02-23 10:33:01.743594216 +0100
103@@ -78,10 +78,10 @@
104 }
105 DFS &operator++() {
106 if(m_curr.e)
107- gd<Hit>(m_curr.e)[m_hitpos] = true;
108+ gd<Hit>(m_curr.e)[this->m_hitpos] = true;
109 else {
110 assert(m_curr.n);
111- gd<Hit>(m_curr.n)[m_hitpos] = true;
112+ gd<Hit>(m_curr.n)[this->m_hitpos] = true;
113 }
114 // try edges
115 if(m_curr.n && follow())
116@@ -143,10 +143,10 @@
117 }
118 bool outs(typename G::outedge_iter start) {
119 for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei)
120- if(!gd<Hit>(*ei)[m_hitpos]) {
121+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
122 m_stack.push(m_curr);
123 m_curr.e = *ei;
124- if(!gd<Hit>(m_curr.e->head)[m_hitpos])
125+ if(!gd<Hit>(m_curr.e->head)[this->m_hitpos])
126 m_curr.n = m_curr.e->head;
127 else
128 m_curr.n = 0;
129@@ -156,10 +156,10 @@
130 }
131 bool ins(typename G::inedge_iter start) {
132 for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei)
133- if(!gd<Hit>(*ei)[m_hitpos]) {
134+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
135 m_stack.push(m_curr);
136 m_curr.e = *ei;
137- if(!gd<Hit>(m_curr.e->tail)[m_hitpos])
138+ if(!gd<Hit>(m_curr.e->tail)[this->m_hitpos])
139 m_curr.n = m_curr.e->tail;
140 else
141 m_curr.n = 0;
142@@ -180,8 +180,8 @@
143 return true;
144 }
145 bool next() {
146- for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter)
147- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
148+ for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter)
149+ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
150 m_curr.e = 0;
151 m_curr.n = *m_nodeiter;
152 m_nodeiter++;
153@@ -205,31 +205,31 @@
154 if(last.n) {
155 if(m_inwards)
156 for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei)
157- if(!gd<Hit>(*ei)[m_hitpos]) {
158+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
159 Node *t = (*ei)->tail;
160- if(gd<Hit>(t)[m_hitpos])
161+ if(gd<Hit>(t)[this->m_hitpos])
162 t = 0;
163 else
164- gd<Hit>(t)[m_hitpos] = true;
165+ gd<Hit>(t)[this->m_hitpos] = true;
166 m_queue.push(V(*ei,t));
167- gd<Hit>(*ei)[m_hitpos] = true;
168+ gd<Hit>(*ei)[this->m_hitpos] = true;
169 }
170 if(m_outwards)
171 for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei)
172- if(!gd<Hit>(*ei)[m_hitpos]) {
173+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
174 Node *h = (*ei)->head;
175- if(gd<Hit>(h)[m_hitpos])
176+ if(gd<Hit>(h)[this->m_hitpos])
177 h = 0;
178 else
179- gd<Hit>(h)[m_hitpos] = true;
180+ gd<Hit>(h)[this->m_hitpos] = true;
181 m_queue.push(V(*ei,h));
182- gd<Hit>(*ei)[m_hitpos] = true;
183+ gd<Hit>(*ei)[this->m_hitpos] = true;
184 }
185 }
186 if(m_queue.empty())
187- for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter)
188- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
189- gd<Hit>(*m_nodeiter)[m_hitpos] = true;
190+ for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter)
191+ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
192+ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
193 m_queue.push(V(0,*m_nodeiter++));
194 break;
195 }
196@@ -241,7 +241,7 @@
197 BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal<G>(g),m_inwards(inwards),m_outwards(outwards) {
198 m_nodeiter = start?g->iter(start):g->nodes().begin();
199 if(m_nodeiter!=g->nodes().end()) {
200- gd<Hit>(*m_nodeiter)[m_hitpos] = true;
201+ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
202 m_queue.push(V(0,*m_nodeiter++));
203 }
204 }
Graph Visualization Tools
This page took 0.049281 seconds and 4 git commands to generate.