# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1422044589 18000
# Node ID 844448ae53f3cd21653d6b56dfeb08a6ea9eba32
# Parent  709f3a77685d96d1264ca0e9a01d53d8398fa6f9# Parent  75a671fcdd734eca88b4ca90a940bed45263924c
maint: Periodic merge of stable to gui-release.

diff -r 709f3a77685d -r 844448ae53f3 liboctave/cruft/Faddeeva/Faddeeva.cc
--- a/liboctave/cruft/Faddeeva/Faddeeva.cc	Fri Jan 23 14:53:10 2015 -0500
+++ b/liboctave/cruft/Faddeeva/Faddeeva.cc	Fri Jan 23 15:23:09 2015 -0500
@@ -139,6 +139,7 @@
                        slight accuracy improvements to erf and dawson
                        functions near the origin.  Use gnulib functions
                        if GNULIB_NAMESPACE is defined.
+     18 December 2012: Slight tweaks (remove recomputation of x*x in Dawson)
 */
 
 /////////////////////////////////////////////////////////////////////////
@@ -210,6 +211,7 @@
 // the Octave developers prefer that we silence the warning.
 #  ifdef GNULIB_NAMESPACE
 #    define floor GNULIB_NAMESPACE::floor
+#    define log GNULIB_NAMESPACE::log
 #  endif
 
 #else // !__cplusplus, i.e. pure C (requires C99 features)
@@ -584,7 +586,7 @@
     }
     else {
       double D = spi2 * FADDEEVA(w_im)(x);
-      double x2 = x*x, y2 = y*y;
+      double y2 = y*y;
       return C
         (D + y2 * (D + x - 2*D*x2)
          + y2*y2 * (D * (0.5 - x2 * (2 - 0.66666666666666666667*x2))