Mercurial > hg > octave-lojdl
changeset 3776:7ed917c1ca60
[project @ 2001-02-06 05:21:32 by jwe]
| author | jwe |
|---|---|
| date | Tue, 06 Feb 2001 05:21:33 +0000 |
| parents | 13905c3a24af |
| children | b4f260ddd748 |
| files | liboctave/ChangeLog liboctave/lo-mappers.cc liboctave/lo-mappers.h src/ChangeLog src/pr-output.cc |
| diffstat | 5 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,5 +1,13 @@ +2001-02-05 John W. Eaton <jwe@bevo.che.wisc.edu> + + * lo-mappers.h (tanh (const Complex&)): Only declare if not + CXX_ISO_COMPLIANT_LIBRARY. + 2001-02-05 Mumit Khan <khan@nanotech.wisc.edu> + * lo-mappers.cc (tanh (const Complex&)): Only define if not + CXX_ISO_COMPLIANT_LIBRARY. + * Makefile.in (TEMPLATE_AR, TEMPLATE_ARFLAGS): Use to create archive libraries containing templates.
--- a/liboctave/lo-mappers.cc +++ b/liboctave/lo-mappers.cc @@ -268,12 +268,16 @@ return x / abs (x); } +#if !defined (CXX_ISO_COMPLIANT_LIBRARY) + Complex tanh (const Complex& x) { return sinh (x) / cosh (x); } +#endif + // complex -> bool mappers. bool
--- a/liboctave/lo-mappers.h +++ b/liboctave/lo-mappers.h @@ -53,7 +53,10 @@ extern Complex floor (const Complex& x); extern Complex round (const Complex& x); extern Complex signum (const Complex& x); + +#if !defined (CXX_ISO_COMPLIANT_LIBRARY) extern Complex tanh (const Complex& x); +#endif extern bool xisnan (const Complex& x); extern bool xfinite (const Complex& x);
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2001-02-05 Mumit Khan <khan@nanotech.wisc.edu> + * pr-output.cc (set_format): Add std:: namespace qualifier as + needed. + * oct-stream.cc (octave_scan): Implement, and specialize for char*. Delete the old template instantiations. (BEGIN_S_CONVERSION): Use strings instead of ostrstreambuf.
--- a/src/pr-output.cc +++ b/src/pr-output.cc @@ -497,7 +497,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 : pow (10.0, x_max - 1); + scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : std::pow (10.0, x_max - 1); set_real_matrix_format (sign, x_max, x_min, inf_or_nan, int_or_inf_or_nan, fw); @@ -848,7 +848,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 : pow (10.0, x_max - 1); + scale = (x_max == 0 || int_or_inf_or_nan) ? 1.0 : std::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); @@ -989,7 +989,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 : pow (10.0, x_max - 1); + scale = (x_max == 0 || all_ints) ? 1.0 : std::pow (10.0, x_max - 1); set_range_format (sign, x_max, x_min, all_ints, fw); }