[Lemon-commits] [lemon_svn] alpar: r2511 - in hugo/trunk: gui lemon

[Lemon SVN]

Author: alpar
Date: Tue Jan 31 22:14:11 2006
New Revision: 2511

Modified:
   hugo/trunk/gui/graph_displayer_canvas.h
   hugo/trunk/gui/xml.h
   hugo/trunk/lemon/graph_to_eps.h

Log:
Fix icc compilation failures.

Modified: hugo/trunk/gui/graph_displayer_canvas.h
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas.h	(original)
+++ hugo/trunk/gui/graph_displayer_canvas.h	Tue Jan 31 22:14:11 2006
@@ -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

Modified: hugo/trunk/gui/xml.h
==============================================================================
--- hugo/trunk/gui/xml.h	(original)
+++ hugo/trunk/gui/xml.h	Tue Jan 31 22:14:11 2006
@@ -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; }

Modified: hugo/trunk/lemon/graph_to_eps.h
==============================================================================
--- hugo/trunk/lemon/graph_to_eps.h	(original)
+++ hugo/trunk/lemon/graph_to_eps.h	Tue Jan 31 22:14:11 2006
@@ -837,7 +837,7 @@
 	break;
       case MALE:
 	bb.add(-p+mycoords[n]);
-	bb.add(xy<double>(1.5*ns,1.5*sqrt(3)*ns)+mycoords[n]);
+	bb.add(xy<double>(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<INTERPOL_PREC;++i)
 	      if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;
 	      else t2=(t1+t2)/2;
-	    double l=sqrt(d.normSquare());
+	    double l=std::sqrt(d.normSquare());
 	    d/=l;
 	    
 	    os << l*(1-(t1+t2)/2) << ' '