diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2012-11-06 21:55:44 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2012-11-06 21:55:44 +0000 |
| commit | 0919dbaab324bc1cbefce106629838104ca12b54 (patch) | |
| tree | 25e143f568c1f14a320d73049700d7110923f684 | |
| parent | 9bae2a9dc5b7e4a2877ac8823d9ae266f6741bb7 (diff) | |
Dimitry Andric: Silence some miscellaneous warnings.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@167493 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/cmath | 2 | ||||
| -rw-r--r-- | include/complex | 2 | ||||
| -rw-r--r-- | include/ext/__hash | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/include/cmath b/include/cmath index a70bbf2d8..d3fbfe6d2 100644 --- a/include/cmath +++ b/include/cmath @@ -1202,7 +1202,9 @@ fdim(_A1 __x, _A2 __y) _NOEXCEPT // fma inline _LIBCPP_INLINE_VISIBILITY float fmaf(float __x, float __y, float __z) _NOEXCEPT {return (float)((double)__x*__y + __z);} +#ifndef FP_FAST_FMAF #define FP_FAST_FMAF +#endif using ::fma; diff --git a/include/complex b/include/complex index 6f8815298..07d375465 100644 --- a/include/complex +++ b/include/complex @@ -1249,10 +1249,12 @@ acosh(const complex<_Tp>& __x) if (isnan(__x.imag())) return complex<_Tp>(abs(__x.real()), __x.imag()); if (isinf(__x.imag())) + { if (__x.real() > 0) return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag())); else return complex<_Tp>(-__x.real(), copysign(__pi * _Tp(0.75), __x.imag())); + } if (__x.real() < 0) return complex<_Tp>(-__x.real(), copysign(__pi, __x.imag())); return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag())); diff --git a/include/ext/__hash b/include/ext/__hash index 8e9635d07..21500e894 100644 --- a/include/ext/__hash +++ b/include/ext/__hash @@ -43,4 +43,4 @@ template <> struct _LIBCPP_VISIBLE hash<char *> }; } -#endif _LIBCPP_EXT_HASH +#endif // _LIBCPP_EXT_HASH |