[cfe-commits] [libcxx] r151731 - /libcxx/trunk/include/cmath

[David Chisnall]

Author: theraven
Date: Wed Feb 29 10:41:21 2012
New Revision: 151731

URL: http://llvm.org/viewvc/llvm-project?rev=151731&view=rev
Log:
Fix MSVC / Sun #ifdef ordering.  Remove another #if-nothing-#endif.

Sorry for the churn.


Modified:
    libcxx/trunk/include/cmath

Modified: libcxx/trunk/include/cmath
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cmath?rev=151731&r1=151730&r2=151731&view=diff
==============================================================================
--- libcxx/trunk/include/cmath (original)
+++ libcxx/trunk/include/cmath Wed Feb 29 10:41:21 2012
@@ -999,11 +999,8 @@
 typename enable_if<is_integral<_A1>::value, double>::type
 sqrt(_A1 __x) {return sqrt((double)__x);}
 
-#ifndef __sun__
-
 // tan
 
-#endif // __sun__
 using ::tan;
 using ::tanf;
 #ifndef __sun__
@@ -1415,11 +1412,12 @@
 lround(_A1 __x) {return lround((double)__x);}
 
 // nan
-
+#endif // _MSC_VER
 #endif // __sun__
 using ::nan;
 using ::nanf;
 #ifndef __sun__
+#ifndef _MSC_VER
 
 // nearbyint