write_float.def (output_float): Remove inadvertent test code from previous patch.

2014-01-20  Jerry DeLisle  <jvdelisle@gcc.gnu>
	    Dominique d'Humieres  <dominiq@lps.ens.fr>

	* io/write_float.def (output_float): Remove inadvertent test
	code from previous patch.

Co-Authored-By: Dominique d'Humieres <dominiq@lps.ens.fr>
From-SVN: r206865

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 3e3ef975d4063fbfc7315a2035ab14219d7b1fa9..6cf885f947f533ec64f9046ede9f2a211281cc05 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-20  Jerry DeLisle  <jvdelisle@gcc.gnu>
+           Dominique d'Humieres  <dominiq@lps.ens.fr>
+
+       * io/write_float.def (output_float): Remove inadvertent test
+       code from previous patch.
+
 2014-01-19  Jerry DeLisle  <jvdelisle@gcc.gnu>
            Dominique d'Humieres  <dominiq@lps.ens.fr>
 

diff --git a/libgfortran/io/write_float.def b/libgfortran/io/write_float.def
index 4777cda93dd6e4a08d369ad1933392a6ab30328d..59428fc4d5dbb3e5d557106d4e82471e2a810f56 100644 (file)
--- a/libgfortran/io/write_float.def
+++ b/libgfortran/io/write_float.def
@@ -373,7 +373,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
   updown:
 
   rchar = '0';
-  if (ft != FMT_F && nbefore == 0 && w > 0 && d == 0 && p == 0)
+  if  (ft != FMT_F && w > 0 && d == 0 && p == 0)
     nbefore = 1;
   /* Scan for trailing zeros to see if we really need to round it.  */
   for(i = nbefore + nafter; i < ndigits; i++)
@@ -389,7 +389,7 @@ output_float (st_parameter_dt *dtp, const fnode *f, char *buffer, size_t size,
     /* Handle the case Fw.0 and value < 1.0 */
     {
       ndigits = 0;
-      if (nzero_real == d && digits[0] >= rchar)
+      if (digits[0] >= rchar)
        {
          /* We rounded to zero but shouldn't have */
          nbefore = 1;