Fix icc compilation failures.
1.1 --- a/gui/graph_displayer_canvas.h Tue Jan 31 20:16:53 2006 +0000
1.2 +++ b/gui/graph_displayer_canvas.h Tue Jan 31 21:14:11 2006 +0000
1.3 @@ -351,7 +351,7 @@
1.4 ///reference to the container, in which the canvas is
1.5 NoteBookTab & mytab;
1.6
1.7 - XY GraphDisplayerCanvas::calcArrowPos(XY, XY, XY, XY, bool);
1.8 + XY calcArrowPos(XY, XY, XY, XY, bool);
1.9 };
1.10
1.11 #endif //GRAPH_DISPLAYER_CANVAS_H
2.1 --- a/gui/xml.h Tue Jan 31 20:16:53 2006 +0000
2.2 +++ b/gui/xml.h Tue Jan 31 21:14:11 2006 +0000
2.3 @@ -207,11 +207,11 @@
2.4 ///
2.5 XmlIo(std::ostream& _os) : _writeMode(true), os(_os),
2.6 level(-1),
2.7 - is(*(std::istream*)(NULL)) {}
2.8 + is(std::cin) {}
2.9 ///\e
2.10 ///
2.11 XmlIo(std::istream& _is) : _writeMode(false),
2.12 - os(*(std::ostream*)(NULL)), is(_is),
2.13 + os(std::cout), is(_is),
2.14 line_number(1) {}
2.15
2.16 ~XmlIo() { if(write()) os<< std::endl; }
3.1 --- a/lemon/graph_to_eps.h Tue Jan 31 20:16:53 2006 +0000
3.2 +++ b/lemon/graph_to_eps.h Tue Jan 31 21:14:11 2006 +0000
3.3 @@ -837,7 +837,7 @@
3.4 break;
3.5 case MALE:
3.6 bb.add(-p+mycoords[n]);
3.7 - bb.add(xy<double>(1.5*ns,1.5*sqrt(3)*ns)+mycoords[n]);
3.8 + bb.add(xy<double>(1.5*ns,1.5*std::sqrt(3.0)*ns)+mycoords[n]);
3.9 break;
3.10 case FEMALE:
3.11 bb.add(p+mycoords[n]);
3.12 @@ -1064,7 +1064,7 @@
3.13 for(int i=0;i<INTERPOL_PREC;++i)
3.14 if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;
3.15 else t2=(t1+t2)/2;
3.16 - double l=sqrt(d.normSquare());
3.17 + double l=std::sqrt(d.normSquare());
3.18 d/=l;
3.19
3.20 os << l*(1-(t1+t2)/2) << ' '