Mercurial > hg > octave-max
diff src/pr-output.cc @ 4269:5b075bd78a91
[project @ 2003-01-03 18:13:14 by jwe]
author | jwe |
---|---|
date | Fri, 03 Jan 2003 18:14:53 +0000 |
parents | ccfdb55c8156 |
children | e7e10ce42860 |
line wrap: on
line diff
--- a/src/pr-output.cc +++ b/src/pr-output.cc @@ -56,6 +56,12 @@ #include "utils.h" #include "variables.h" +#if defined (__GNUG__) +#define STD_QUAL std:: +#else +#define STD_QUAL +#endif + // TRUE means use a scaled fixed point format for `format long' and // `format short'. static bool Vfixed_point_format; @@ -499,7 +505,7 @@ int x_min = min_abs == 0.0 ? 0 : static_cast<int> (floor (log10 (min_abs) + 1.0)); - scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : std::pow (10.0, x_max - 1); + scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : STD_QUAL pow (10.0, x_max - 1); set_real_matrix_format (sign, x_max, x_min, inf_or_nan, int_or_inf_or_nan, fw); @@ -850,7 +856,7 @@ int x_max = r_x_max > i_x_max ? r_x_max : i_x_max; int x_min = r_x_min > i_x_min ? r_x_min : i_x_min; - scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : std::pow (10.0, x_max - 1); + scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : STD_QUAL pow (10.0, x_max - 1); set_complex_matrix_format (sign, x_max, x_min, r_x_max, r_x_min, inf_or_nan, int_or_inf_or_nan, r_fw, i_fw); @@ -991,7 +997,7 @@ int x_min = min_abs == 0.0 ? 0 : static_cast<int> (floor (log10 (min_abs) + 1.0)); - scale = (x_max == 0 || all_ints) ? 1.0 : std::pow (10.0, x_max - 1); + scale = (x_max == 0 || all_ints) ? 1.0 : STD_QUAL pow (10.0, x_max - 1); set_range_format (sign, x_max, x_min, all_ints, fw); }