Mercurial > octave
comparison liboctave/numeric/lo-mappers.h @ 21231:5f318c8ec634
eliminate feature tests from lo-specfun.h
* lo-specfun.h, lo-specfun.cc (xacosh, xasinh, xatanh, xerf, xerfc
xexpm1, xlog1p, xcbrt): Rename to have 'x' prefix. Conditionally
define in .cc file. Change all uses Move complex versions of acosh,
asinh, and atanh functions here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 09 Feb 2016 04:15:50 -0500 |
parents | 538b57866b90 |
children | b8cf410b5c88 |
comparison
equal
deleted
inserted
replaced
21230:721539013db4 | 21231:5f318c8ec634 |
---|---|
101 { | 101 { |
102 return xisnan (y) ? x : (x >= y ? x : y); | 102 return xisnan (y) ? x : (x >= y ? x : y); |
103 } | 103 } |
104 | 104 |
105 extern OCTAVE_API Complex acos (const Complex& x); | 105 extern OCTAVE_API Complex acos (const Complex& x); |
106 extern OCTAVE_API Complex acosh (const Complex& x); | |
107 extern OCTAVE_API Complex asin (const Complex& x); | 106 extern OCTAVE_API Complex asin (const Complex& x); |
108 extern OCTAVE_API Complex asinh (const Complex& x); | |
109 extern OCTAVE_API Complex atan (const Complex& x); | 107 extern OCTAVE_API Complex atan (const Complex& x); |
110 extern OCTAVE_API Complex atanh (const Complex& x); | |
111 | 108 |
112 extern OCTAVE_API bool octave_is_NA (const Complex& x); | 109 extern OCTAVE_API bool octave_is_NA (const Complex& x); |
113 extern OCTAVE_API bool octave_is_NaN_or_NA (const Complex& x); | 110 extern OCTAVE_API bool octave_is_NaN_or_NA (const Complex& x); |
114 | 111 |
115 extern OCTAVE_API Complex xmin (const Complex& x, const Complex& y); | 112 extern OCTAVE_API Complex xmin (const Complex& x, const Complex& y); |
166 { | 163 { |
167 return xisnan (y) ? x : (x >= y ? x : y); | 164 return xisnan (y) ? x : (x >= y ? x : y); |
168 } | 165 } |
169 | 166 |
170 extern OCTAVE_API FloatComplex acos (const FloatComplex& x); | 167 extern OCTAVE_API FloatComplex acos (const FloatComplex& x); |
171 extern OCTAVE_API FloatComplex acosh (const FloatComplex& x); | |
172 extern OCTAVE_API FloatComplex asin (const FloatComplex& x); | 168 extern OCTAVE_API FloatComplex asin (const FloatComplex& x); |
173 extern OCTAVE_API FloatComplex asinh (const FloatComplex& x); | |
174 extern OCTAVE_API FloatComplex atan (const FloatComplex& x); | 169 extern OCTAVE_API FloatComplex atan (const FloatComplex& x); |
175 extern OCTAVE_API FloatComplex atanh (const FloatComplex& x); | |
176 | 170 |
177 extern OCTAVE_API bool octave_is_NA (const FloatComplex& x); | 171 extern OCTAVE_API bool octave_is_NA (const FloatComplex& x); |
178 extern OCTAVE_API bool octave_is_NaN_or_NA (const FloatComplex& x); | 172 extern OCTAVE_API bool octave_is_NaN_or_NA (const FloatComplex& x); |
179 | 173 |
180 extern OCTAVE_API FloatComplex xmin (const FloatComplex& x, | 174 extern OCTAVE_API FloatComplex xmin (const FloatComplex& x, |