Changeset 1874 in Sophya

Timestamp:

Jan 20, 2002, 12:40:42 AM (24 years ago)

Author:

ansari

Message:

modif prog vecmapstl.cc - Reza 19/01/2002

File:

• trunk/Eval/COS/vecmapstl.cc (modified) (1 diff)

trunk/Eval/COS/vecmapstl.cc

@@ -74 +74 @@
     convCR czr, czr1(z1), czr2(zd2), czr3;
     /* if defined(__GNUG__) && (__GNUC__ < 3) */
-#if defined(__GNUG__) 
     complex<float> za;
     complex<double> zb,zc;
     za = czr1.ToComplexF(); zb = czr1.ToComplexD(); zc = czr2.ToComplexD();  
-    cout << " GNUG_Version: __GNUC__ = " << __GNUC__ << endl;
     cout << " convCR:.ToComplexF/D() za=(zb)=czr1" << za << " zc=" << zc 
     << " zb+zc=" << zb+zc << endl ; 
+#if defined(__GNUG__) 
+    cout << " GNUG_Version: __GNUC__ = " << __GNUC__ << endl;
 #else
-    cout << " convCR: czr1(z1)" << (complex<float>)(czr1)
+    cout << " convCR: (complex<float>)(czr1(z1))" << (complex<float>)(czr1)
          << " czr2(z2)" << (complex<double>)(czr2)  
          << " 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;
   }
   catch(exception exc){