generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MSVC / Sun #ifdef ordering. Remove another #if-nothing-#endif.

Browse Source 
Sorry for the churn.



git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@151731 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Chisnall 2012-02-29 16:41:21 +00:00
parent 26cba271cb
commit b6e7c305d4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/cmath
View File

@ -999,11 +999,8 @@ inline _LIBCPP_INLINE_VISIBILITY
typename enable_if<is_integral<_A1>::value, double>::type typename enable_if<is_integral<_A1>::value, double>::type
sqrt(_A1 __x) {return sqrt((double)__x);} sqrt(_A1 __x) {return sqrt((double)__x);}
#ifndef __sun__
// tan // tan
#endif // __sun__
using ::tan; using ::tan;
using ::tanf; using ::tanf;
#ifndef __sun__ #ifndef __sun__
@ -1415,11 +1412,12 @@ typename enable_if<is_integral<_A1>::value, long>::type
lround(_A1 __x) {return lround((double)__x);} lround(_A1 __x) {return lround((double)__x);}
// nan // nan
#endif // _MSC_VER
#endif // __sun__ #endif // __sun__
using ::nan; using ::nan;
using ::nanf; using ::nanf;
#ifndef __sun__ #ifndef __sun__
#ifndef _MSC_VER
// nearbyint // nearbyint