Fix icc compilation failures. gui
authoralpar
Tue, 31 Jan 2006 21:14:11 +0000
branchgui
changeset 127656ac25e009b
parent 126 e682395d45f7
child 128 3a4b6b31afb3
Fix icc compilation failures.
graph_displayer_canvas.h
xml.h
     1.1 --- a/graph_displayer_canvas.h	Tue Jan 24 16:07:38 2006 +0000
     1.2 +++ b/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/xml.h	Tue Jan 24 16:07:38 2006 +0000
     2.2 +++ b/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; }