# HG changeset patch # User alpar # Date 1138742051 0 # Node ID 656ac25e009bf725ffa01c48895d42cb03368bcc # Parent e682395d45f761ce6913e33adab9107f6f8f50af Fix icc compilation failures. diff -r e682395d45f7 -r 656ac25e009b graph_displayer_canvas.h --- a/graph_displayer_canvas.h Tue Jan 24 16:07:38 2006 +0000 +++ b/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 e682395d45f7 -r 656ac25e009b xml.h --- a/xml.h Tue Jan 24 16:07:38 2006 +0000 +++ b/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; }