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 | 119703f98410eb8ff0b312145e120b5d0406ebd7 (patch) | |
| tree | 3a85fe138e017dc6e995119bc244561f7442de0c | |
| parent | 3e2740a36cf5f41a9e8306e5e911f2b9a57a15ee (diff) | |
| download | bcm5719-llvm-119703f98410eb8ff0b312145e120b5d0406ebd7.tar.gz bcm5719-llvm-119703f98410eb8ff0b312145e120b5d0406ebd7.zip | |
Dimitry Andric: Silence some miscellaneous warnings.
llvm-svn: 167493
| -rw-r--r-- | libcxx/include/cmath | 2 | ||||
| -rw-r--r-- | libcxx/include/complex | 2 | ||||
| -rw-r--r-- | libcxx/include/ext/__hash | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libcxx/include/cmath b/libcxx/include/cmath index a70bbf2d890..d3fbfe6d23f 100644 --- a/libcxx/include/cmath +++ b/libcxx/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/libcxx/include/complex b/libcxx/include/complex index 6f8815298ca..07d3754658f 100644 --- a/libcxx/include/complex +++ b/libcxx/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/libcxx/include/ext/__hash b/libcxx/include/ext/__hash index 8e9635d07f5..21500e894dc 100644 --- a/libcxx/include/ext/__hash +++ b/libcxx/include/ext/__hash @@ -43,4 +43,4 @@ template <> struct _LIBCPP_VISIBLE hash<char *> }; } -#endif _LIBCPP_EXT_HASH +#endif // _LIBCPP_EXT_HASH |
