# HG changeset patch # User alpar # Date 1138742051 0 # Node ID 0722ea2b0907ad2fbc80f6d34eb3d67c3c37c554 # Parent 67b38d699ea7ce15550d3bb1ac242fca72f937f9 Fix icc compilation failures. diff -r 67b38d699ea7 -r 0722ea2b0907 gui/graph_displayer_canvas.h --- a/gui/graph_displayer_canvas.h Tue Jan 31 20:16:53 2006 +0000 +++ b/gui/graph_displayer_canvas.h Tue Jan 31 21:14:11 2006 +0000 @@ -351,7 +351,7 @@ ///reference to the container, in which the canvas is NoteBookTab & mytab; - XY GraphDisplayerCanvas::calcArrowPos(XY, XY, XY, XY, bool); + XY calcArrowPos(XY, XY, XY, XY, bool); }; #endif //GRAPH_DISPLAYER_CANVAS_H diff -r 67b38d699ea7 -r 0722ea2b0907 gui/xml.h --- a/gui/xml.h Tue Jan 31 20:16:53 2006 +0000 +++ b/gui/xml.h Tue Jan 31 21:14:11 2006 +0000 @@ -207,11 +207,11 @@ /// XmlIo(std::ostream& _os) : _writeMode(true), os(_os), level(-1), - is(*(std::istream*)(NULL)) {} + is(std::cin) {} ///\e /// XmlIo(std::istream& _is) : _writeMode(false), - os(*(std::ostream*)(NULL)), is(_is), + os(std::cout), is(_is), line_number(1) {} ~XmlIo() { if(write()) os<< std::endl; } diff -r 67b38d699ea7 -r 0722ea2b0907 lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h Tue Jan 31 20:16:53 2006 +0000 +++ b/lemon/graph_to_eps.h Tue Jan 31 21:14:11 2006 +0000 @@ -837,7 +837,7 @@ break; case MALE: bb.add(-p+mycoords[n]); - bb.add(xy(1.5*ns,1.5*sqrt(3)*ns)+mycoords[n]); + bb.add(xy(1.5*ns,1.5*std::sqrt(3.0)*ns)+mycoords[n]); break; case FEMALE: bb.add(p+mycoords[n]); @@ -1064,7 +1064,7 @@ for(int i=0;i