Changeset 1936:0722ea2b0907 in lemon-0.x

Timestamp:

01/31/06 22:14:11 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2511

Message:

Fix icc compilation failures.

Files:

• gui/graph_displayer_canvas.h (modified) (1 diff)
• gui/xml.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (2 diffs)

gui/graph_displayer_canvas.h

@@ -352 +352 @@
   NoteBookTab & mytab;
 
-  XY GraphDisplayerCanvas::calcArrowPos(XY, XY, XY, XY, bool);
+  XY calcArrowPos(XY, XY, XY, XY, bool);
 };
 

gui/xml.h

@@ -208 +208 @@
     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) {}
 

lemon/graph_to_eps.h

@@ -838 +838 @@
       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:
@@ -1065 +1065 @@
               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;