# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1267433396 -3600
# Node ID eeb6c09ec51a4fc3b32de48b09289c959cb516e0
# Parent  fb62fbbe28c0da5694e1da13a1abebcf7f429591
avoid g++ extension in str2double

diff -r fb62fbbe28c0 -r eeb6c09ec51a src/ChangeLog
--- a/src/ChangeLog	Sun Feb 28 23:27:09 2010 -0500
+++ b/src/ChangeLog	Mon Mar 01 09:49:56 2010 +0100
@@ -1,3 +1,8 @@
+2010-03-01  Jaroslav Hajek  <highegg@gmail.com>
+
+	* DLD-FUNCTIONS/str2double.cc (str2double1): Use ISO-conformant code
+	for setting the real and imaginary part.
+
 2010-02-28  David Bateman  <dbateman@free.fr>
 
 	* DLD-FUNCTIONS/urlwrite.cc (curl_handle::init): Don't set
diff -r fb62fbbe28c0 -r eeb6c09ec51a src/DLD-FUNCTIONS/str2double.cc
--- a/src/DLD-FUNCTIONS/str2double.cc	Sun Feb 28 23:27:09 2010 -0500
+++ b/src/DLD-FUNCTIONS/str2double.cc	Mon Mar 01 09:49:56 2010 +0100
@@ -157,9 +157,17 @@
   else
     {
       if (i1)
-        val.imag () = num;
+#ifdef __GNUC__
+        val.imag () = num; // GNU C++
+#else
+        val = Complex (val.real (), num); // ISO C++
+#endif
       else
-        val.real () = num;
+#ifdef __GNUC__
+        val.real () = num; // GNU C++
+#else
+        val = Complex (num, val.imag ()); // ISO C++
+#endif
 
       if (! is.eof ())
         {
@@ -168,9 +176,17 @@
           else
             {
               if (i2)
-                val.imag () = num;
+#ifdef __GNUC__
+                val.imag () = num; // GNU C++
+#else
+                val = Complex (val.real (), num); // ISO C++
+#endif
               else
-                val.real () = num;
+#ifdef __GNUC__
+                val.real () = num; // GNU C++
+#else
+                val = Complex (num, val.imag ()); // ISO C++
+#endif
             }
         }
     }