Dimitry Andric: Silence some miscellaneous warnings.

llvm-svn: 167493

diff --git a/libcxx/include/cmath b/libcxx/include/cmath
index a70bbf2..d3fbfe6 100644 (file)
--- 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 6f88152..07d3754 100644 (file)
--- 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 8e9635d..21500e8 100644 (file)
--- 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