[cfe-commits] [libcxx] r167493 - in /libcxx/trunk/include: cmath complex ext/__hash

[Howard Hinnant]

Author: hhinnant
Date: Tue Nov  6 15:55:44 2012
New Revision: 167493

URL: http://llvm.org/viewvc/llvm-project?rev=167493&view=rev
Log:
Dimitry Andric:  Silence some miscellaneous warnings.

Modified:
    libcxx/trunk/include/cmath
    libcxx/trunk/include/complex
    libcxx/trunk/include/ext/__hash

Modified: libcxx/trunk/include/cmath
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cmath?rev=167493&r1=167492&r2=167493&view=diff
==============================================================================
--- libcxx/trunk/include/cmath (original)
+++ libcxx/trunk/include/cmath Tue Nov  6 15:55:44 2012
@@ -1202,7 +1202,9 @@
 // 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;
 

Modified: libcxx/trunk/include/complex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/complex?rev=167493&r1=167492&r2=167493&view=diff
==============================================================================
--- libcxx/trunk/include/complex (original)
+++ libcxx/trunk/include/complex Tue Nov  6 15:55:44 2012
@@ -1249,10 +1249,12 @@
         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()));

Modified: libcxx/trunk/include/ext/__hash
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/ext/__hash?rev=167493&r1=167492&r2=167493&view=diff
==============================================================================
--- libcxx/trunk/include/ext/__hash (original)
+++ libcxx/trunk/include/ext/__hash Tue Nov  6 15:55:44 2012
@@ -43,4 +43,4 @@
 };
 }
 
-#endif _LIBCPP_EXT_HASH
+#endif  // _LIBCPP_EXT_HASH