diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-02-29 16:41:21 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-02-29 16:41:21 +0000 |
| commit | 55661e7305d44abccb85561912c1307f3a42df24 (patch) | |
| tree | e6f7113e1326099035f42e05276272484a351b48 | |
| parent | c2f9dc91c1722d04ce0b0e695bb89820c7bf995d (diff) | |
| download | bcm5719-llvm-55661e7305d44abccb85561912c1307f3a42df24.tar.gz bcm5719-llvm-55661e7305d44abccb85561912c1307f3a42df24.zip | |
Fix MSVC / Sun #ifdef ordering. Remove another #if-nothing-#endif.
Sorry for the churn.
llvm-svn: 151731
| -rw-r--r-- | libcxx/include/cmath | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libcxx/include/cmath b/libcxx/include/cmath index a05a3d8cb61..026889f81e5 100644 --- a/libcxx/include/cmath +++ b/libcxx/include/cmath @@ -999,11 +999,8 @@ inline _LIBCPP_INLINE_VISIBILITY 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 @@ typename enable_if<is_integral<_A1>::value, long>::type lround(_A1 __x) {return lround((double)__x);} // nan - +#endif // _MSC_VER #endif // __sun__ using ::nan; using ::nanf; #ifndef __sun__ +#ifndef _MSC_VER // nearbyint |
