1.1 --- a/complex_float_msvc	Wed Oct 29 22:40:19 2008 +0000
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,106 +0,0 @@
     1.4 -Work around missing std::complex members under MSVC
     1.5 -
     1.6 -diff -r 2af3fecd26e9 liboctave/ChangeLog
     1.7 ---- a/liboctave/ChangeLog	Tue Oct 28 21:34:31 2008 +0000
     1.8 -+++ b/liboctave/ChangeLog	Wed Oct 29 22:39:20 2008 +0000
     1.9 -@@ -1,3 +1,9 @@
    1.10 -+2008-10-29  Michael Goffioul  <michael.goffioul@gmail.com>
    1.11 -+
    1.12 -+	* lo-specfun.cc (cbesj, cbesy, cbesi, cbesk, cbesh1, cbesh2): Do not
    1.13 -+	use std::complex::real() and std::complex::imag() as l-value, this is
    1.14 -+	not supported under MSVC.
    1.15 -+
    1.16 - 2008-10-28  John W. Eaton  <jwe@octave.org>
    1.17 - 
    1.18 - 	* lo-specfun.cc: Fix prototypes for the Fortran subroutines cbesh,
    1.19 -diff -r 2af3fecd26e9 liboctave/lo-specfun.cc
    1.20 ---- a/liboctave/lo-specfun.cc	Tue Oct 28 21:34:31 2008 +0000
    1.21 -+++ b/liboctave/lo-specfun.cc	Wed Oct 29 22:39:20 2008 +0000
    1.22 -@@ -1299,13 +1299,12 @@
    1.23 - 
    1.24 -       if (kode != 2)
    1.25 - 	{
    1.26 --	  float expz = exp (std::abs (imag (z))); 
    1.27 --	  y.real () *= expz;
    1.28 --	  y.imag () *= expz;
    1.29 -+	  float expz = exp (std::abs (imag (z)));
    1.30 -+	  y *= expz;
    1.31 - 	}
    1.32 - 
    1.33 -       if (imag (z) == 0.0 && real (z) >= 0.0)
    1.34 --	y.imag () = 0.0;
    1.35 -+	y = FloatComplex (y.real (), 0.0);
    1.36 - 
    1.37 -       retval = bessel_return_value (y, ierr);
    1.38 -     }
    1.39 -@@ -1363,12 +1362,11 @@
    1.40 - 	  if (kode != 2)
    1.41 - 	    {
    1.42 - 	      float expz = exp (std::abs (imag (z)));
    1.43 --	      y.real () *= expz;
    1.44 --	      y.imag () *= expz;
    1.45 -+	      y *= expz;
    1.46 - 	    }
    1.47 - 
    1.48 - 	  if (imag (z) == 0.0 && real (z) >= 0.0)
    1.49 --	    y.imag () = 0.0;
    1.50 -+	    y = FloatComplex (y.real (), 0.0);
    1.51 - 	}
    1.52 - 
    1.53 -       return bessel_return_value (y, ierr);
    1.54 -@@ -1421,7 +1419,7 @@
    1.55 - 	}
    1.56 - 
    1.57 -       if (imag (z) == 0.0 && real (z) >= 0.0)
    1.58 --	y.imag () = 0.0;
    1.59 -+	y = FloatComplex (y.real (), 0.0);
    1.60 - 
    1.61 -       retval = bessel_return_value (y, ierr);
    1.62 -     }
    1.63 -@@ -1481,14 +1479,14 @@
    1.64 - 	      float rexpz = real (expz);
    1.65 - 	      float iexpz = imag (expz);
    1.66 - 
    1.67 --	      float tmp = real (y) * rexpz - imag (y) * iexpz;
    1.68 -+	      float tmp_r = real (y) * rexpz - imag (y) * iexpz;
    1.69 -+	      float tmp_i = real (y) * iexpz + imag (y) * rexpz;
    1.70 - 
    1.71 --	      y.imag () = real (y) * iexpz + imag (y) * rexpz;
    1.72 --	      y.real () = tmp;
    1.73 -+	      y = FloatComplex (tmp_r, tmp_i);
    1.74 - 	    }
    1.75 - 
    1.76 - 	  if (imag (z) == 0.0 && real (z) >= 0.0)
    1.77 --	    y.imag () = 0.0;
    1.78 -+	    y = FloatComplex (y.real (), 0.0);
    1.79 - 	}
    1.80 - 
    1.81 -       retval = bessel_return_value (y, ierr);
    1.82 -@@ -1523,10 +1521,10 @@
    1.83 - 	  float rexpz = real (expz);
    1.84 - 	  float iexpz = imag (expz);
    1.85 - 
    1.86 --	  float tmp = real (y) * rexpz - imag (y) * iexpz;
    1.87 -+	  float tmp_r = real (y) * rexpz - imag (y) * iexpz;
    1.88 -+	  float tmp_i = real (y) * iexpz + imag (y) * rexpz;
    1.89 - 
    1.90 --	  y.imag () = real (y) * iexpz + imag (y) * rexpz;
    1.91 --	  y.real () = tmp;
    1.92 -+	  y = FloatComplex (tmp_r, tmp_i);
    1.93 - 	}
    1.94 - 
    1.95 -       retval = bessel_return_value (y, ierr);
    1.96 -@@ -1565,10 +1563,10 @@
    1.97 - 	  float rexpz = real (expz);
    1.98 - 	  float iexpz = imag (expz);
    1.99 - 
   1.100 --	  float tmp = real (y) * rexpz - imag (y) * iexpz;
   1.101 -+	  float tmp_r = real (y) * rexpz - imag (y) * iexpz;
   1.102 -+	  float tmp_i = real (y) * iexpz + imag (y) * rexpz;
   1.103 - 
   1.104 --	  y.imag () = real (y) * iexpz + imag (y) * rexpz;
   1.105 --	  y.real () = tmp;
   1.106 -+	  y = FloatComplex (tmp_r, tmp_i);
   1.107 - 	}
   1.108 - 
   1.109 -       retval = bessel_return_value (y, ierr);

     2.1 --- a/series	Wed Oct 29 22:40:19 2008 +0000
     2.2 +++ b/series	Thu Oct 30 11:35:04 2008 +0000
     2.3 @@ -1,3 +1,2 @@
     2.4  support_cpp_scripts
     2.5  fltk_lock
     2.6 -complex_float_msvc