Mercurial > octave-nkf
changeset 3777:b4f260ddd748
[project @ 2001-02-06 15:57:23 by jwe]
| author | jwe |
|---|---|
| date | Tue, 06 Feb 2001 15:57:23 +0000 |
| parents | 7ed917c1ca60 |
| children | 594ead754542 |
| files | liboctave/ChangeLog liboctave/lo-mappers.cc liboctave/lo-mappers.h |
| diffstat | 3 files changed, 35 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Tue Feb 06 05:21:33 2001 +0000 +++ b/liboctave/ChangeLog Tue Feb 06 15:57:23 2001 +0000 @@ -1,3 +1,9 @@ +2001-02-06 John W. Eaton <jwe@bevo.che.wisc.edu> + + * lo-mappers.h, lo-mappers.cc (log10 (const Complex&), + tanh (const Complex&)): Declare and define if not + CXX_ISO_COMPLIANT_LIBRARY. + 2001-02-05 John W. Eaton <jwe@bevo.che.wisc.edu> * lo-mappers.h (tanh (const Complex&)): Only declare if not
--- a/liboctave/lo-mappers.cc Tue Feb 06 05:21:33 2001 +0000 +++ b/liboctave/lo-mappers.cc Tue Feb 06 15:57:23 2001 +0000 @@ -238,6 +238,28 @@ return log ((1.0 + x) / (1.0 - x)) / 2.0; } +#if !defined (CXX_ISO_COMPLIANT_LIBRARY) + +Complex +log10 (const Complex& x) +{ + return M_LOG10E * log (x); +} + +Complex +tan (const Complex& x) +{ + return sin (x) / cos (x); +} + +Complex +tanh (const Complex& x) +{ + return sinh (x) / cosh (x); +} + +#endif + Complex ceil (const Complex& x) { @@ -268,16 +290,6 @@ 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 Tue Feb 06 05:21:33 2001 +0000 +++ b/liboctave/lo-mappers.h Tue Feb 06 15:57:23 2001 +0000 @@ -48,16 +48,19 @@ extern Complex asinh (const Complex& x); extern Complex atan (const Complex& x); extern Complex atanh (const Complex& x); + +#if !defined (CXX_ISO_COMPLIANT_LIBRARY) +extern Complex log10 (const Complex& x); +extern Complex tan (const Complex& x); +extern Complex tanh (const Complex& x); +#endif + extern Complex ceil (const Complex& x); extern Complex fix (const Complex& x); 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); extern bool xisinf (const Complex& x);