Changeset 2803 in Sophya for trunk/Eval/COS

Timestamp:

Jun 9, 2005, 11:33:33 AM (20 years ago)

Author:

ansari

Message:

petites corrections/adaptation suite test compil intel icc - Reza 9 Juin 2005

Location:

trunk/Eval/COS

Files:

• lance.h (modified) (1 diff)
• vecmapstl.cc (modified) (2 diffs)

trunk/Eval/COS/lance.h

@@ -1 @@
-#include <iostream.h>
+#include <iostream>
 #include <exception>
 #include <string>

trunk/Eval/COS/vecmapstl.cc

@@ -5 +5 @@
 #include <string>
 
-#include <iostream.h>
+#include <iostream>
 #include <vector>
 #include <map>
@@ -86 +86 @@
          << " czr1+czr2= " << (complex<double>)czr2+(complex<double>)czr1 << endl;
 #endif
-    complex<double> zdd;
-    zdd = static_cast< complex<double> >(czr1);
-    cout << " zdd = static_cast< complex<double> >(czr1) = " << zdd << endl;
+    complex<double> zdd(2);
+    //    zdd = static_cast< complex<double> >(czr1);
+    //    cout << " zdd = static_cast< complex<double> >(czr1) = " << zdd << endl;
+    // ----------- Mai 2005 , compilation avec icc
+    // Suite a l'essai de compilation avec icc (Intel compiler)
+    // on fait un appel explicite a l'operateur de comversion
+    // object.operator T() 
+    zdd = czr1.operator complex<double>();
+    cout << " zdd = czr1.operator complex<double>() : " << zdd << endl;
+    double xx ; 
+    xx = czr1; 
+    
   }
   catch(exception exc){