[libcxx-commits] [libcxx] 404d311 - [libc++][NFC] Remove std:: qualifications from math headers

Nikolas Klauser via libcxx-commits libcxx-commits at lists.llvm.org
Mon Jul 31 17:19:58 PDT 2023


Author: Nikolas Klauser
Date: 2023-07-31T17:19:44-07:00
New Revision: 404d31196fce815cd1b230f86a59f522f2f4a598

URL: https://github.com/llvm/llvm-project/commit/404d31196fce815cd1b230f86a59f522f2f4a598
DIFF: https://github.com/llvm/llvm-project/commit/404d31196fce815cd1b230f86a59f522f2f4a598.diff

LOG: [libc++][NFC] Remove std:: qualifications from math headers

Reviewed By: #libc, Mordante

Spies: Mordante, libcxx-commits

Differential Revision: https://reviews.llvm.org/D155259

Added: 
    

Modified: 
    libcxx/include/__math/abs.h
    libcxx/include/__math/copysign.h
    libcxx/include/__math/error_functions.h
    libcxx/include/__math/exponential_functions.h
    libcxx/include/__math/fdim.h
    libcxx/include/__math/fma.h
    libcxx/include/__math/gamma.h
    libcxx/include/__math/hyperbolic_functions.h
    libcxx/include/__math/hypot.h
    libcxx/include/__math/inverse_hyperbolic_functions.h
    libcxx/include/__math/inverse_trigonometric_functions.h
    libcxx/include/__math/logarithms.h
    libcxx/include/__math/min_max.h
    libcxx/include/__math/modulo.h
    libcxx/include/__math/remainder.h
    libcxx/include/__math/roots.h
    libcxx/include/__math/rounding_functions.h
    libcxx/include/__math/traits.h
    libcxx/include/__math/trigonometric_functions.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__math/abs.h b/libcxx/include/__math/abs.h
index a2f500f1052d47..d204797af9dd63 100644
--- a/libcxx/include/__math/abs.h
+++ b/libcxx/include/__math/abs.h
@@ -34,7 +34,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fabs(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 fabs(_A1 __x) _NOEXCEPT {return __builtin_fabs((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/copysign.h b/libcxx/include/__math/copysign.h
index 926a549fe97d78..36e2b107b8a44b 100644
--- a/libcxx/include/__math/copysign.h
+++ b/libcxx/include/__math/copysign.h
@@ -35,11 +35,11 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double copysign(long dou
 
 template <class _A1, class _A2>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
     copysign(_A1 __x, _A2 __y) _NOEXCEPT {
   return ::__builtin_copysign(__x, __y);

diff  --git a/libcxx/include/__math/error_functions.h b/libcxx/include/__math/error_functions.h
index 8471e9132a02be..e4bc7dbd242e27 100644
--- a/libcxx/include/__math/error_functions.h
+++ b/libcxx/include/__math/error_functions.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double erf(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 erf(_A1 __x) _NOEXCEPT {return __builtin_erf((double)__x);}
 
 // erfc
@@ -50,7 +50,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double erfc(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 erfc(_A1 __x) _NOEXCEPT {return __builtin_erfc((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/exponential_functions.h b/libcxx/include/__math/exponential_functions.h
index 90f84b789f67d6..fd9515631d2b2d 100644
--- a/libcxx/include/__math/exponential_functions.h
+++ b/libcxx/include/__math/exponential_functions.h
@@ -37,7 +37,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double exp(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 exp(_A1 __x) _NOEXCEPT {return __builtin_exp((double)__x);}
 
 // frexp
@@ -53,7 +53,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double frexp(long double __x, int* __e) _NOEXC
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 frexp(_A1 __x, int* __e) _NOEXCEPT {return __builtin_frexp((double)__x, __e);}
 
 // ldexp
@@ -69,7 +69,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double ldexp(long double __x, int __e) _NOEXCE
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 ldexp(_A1 __x, int __e) _NOEXCEPT {return __builtin_ldexp((double)__x, __e);}
 
 // exp2
@@ -85,7 +85,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double exp2(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 exp2(_A1 __x) _NOEXCEPT {return __builtin_exp2((double)__x);}
 
 // expm1
@@ -101,7 +101,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double expm1(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 expm1(_A1 __x) _NOEXCEPT {return __builtin_expm1((double)__x);}
 
 // scalbln
@@ -117,7 +117,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double scalbln(long double __x, long __y) _NOE
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 scalbln(_A1 __x, long __y) _NOEXCEPT {return __builtin_scalbln((double)__x, __y);}
 
 // scalbn
@@ -133,7 +133,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double scalbn(long double __x, int __y) _NOEXC
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 scalbn(_A1 __x, int __y) _NOEXCEPT {return __builtin_scalbn((double)__x, __y);}
 
 // pow
@@ -149,17 +149,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double pow(long double __x, long double __y) _
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 pow(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::pow((__result_type)__x, (__result_type)__y);
 }
 

diff  --git a/libcxx/include/__math/fdim.h b/libcxx/include/__math/fdim.h
index 23c8040eac405b..e0cc95faf5789d 100644
--- a/libcxx/include/__math/fdim.h
+++ b/libcxx/include/__math/fdim.h
@@ -34,17 +34,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double fdim(long double __x, long double __y)
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 fdim(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::fdim((__result_type)__x, (__result_type)__y);
 }
 

diff  --git a/libcxx/include/__math/fma.h b/libcxx/include/__math/fma.h
index 277fc17540a368..89c23a4f5cd905 100644
--- a/libcxx/include/__math/fma.h
+++ b/libcxx/include/__math/fma.h
@@ -41,19 +41,19 @@ inline _LIBCPP_HIDE_FROM_ABI long double fma(long double __x, long double __y, l
 
 template <class _A1, class _A2, class _A3>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value &&
-    std::is_arithmetic<_A3>::value,
-    std::__promote<_A1, _A2, _A3>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value &&
+    is_arithmetic<_A3>::value,
+    __promote<_A1, _A2, _A3>
 >::type
 fma(_A1 __x, _A2 __y, _A3 __z) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2, _A3>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value &&
-                     std::_IsSame<_A3, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2, _A3>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value &&
+                     _IsSame<_A3, __result_type>::value)), "");
     return __builtin_fma((__result_type)__x, (__result_type)__y, (__result_type)__z);
 }
 

diff  --git a/libcxx/include/__math/gamma.h b/libcxx/include/__math/gamma.h
index 7b4e695225f396..f188da61a5dd86 100644
--- a/libcxx/include/__math/gamma.h
+++ b/libcxx/include/__math/gamma.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double lgamma(long double __x) _NOEXCEPT {retu
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 lgamma(_A1 __x) _NOEXCEPT {return __builtin_lgamma((double)__x);}
 
 // nan
@@ -52,7 +52,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double tgamma(long double __x) _NOEXCEPT {retu
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 tgamma(_A1 __x) _NOEXCEPT {return __builtin_tgamma((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/hyperbolic_functions.h b/libcxx/include/__math/hyperbolic_functions.h
index 36e9a023003d45..5160a60173a6eb 100644
--- a/libcxx/include/__math/hyperbolic_functions.h
+++ b/libcxx/include/__math/hyperbolic_functions.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double cosh(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 cosh(_A1 __x) _NOEXCEPT {return __builtin_cosh((double)__x);}
 
 // sinh
@@ -50,7 +50,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double sinh(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 sinh(_A1 __x) _NOEXCEPT {return __builtin_sinh((double)__x);}
 
 // tanh
@@ -66,7 +66,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double tanh(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 tanh(_A1 __x) _NOEXCEPT {return __builtin_tanh((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/hypot.h b/libcxx/include/__math/hypot.h
index f5a527a9731549..7f6dd7ea51469c 100644
--- a/libcxx/include/__math/hypot.h
+++ b/libcxx/include/__math/hypot.h
@@ -34,17 +34,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double hypot(long double __x, long double __y)
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 hypot(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::hypot((__result_type)__x, (__result_type)__y);
 }
 

diff  --git a/libcxx/include/__math/inverse_hyperbolic_functions.h b/libcxx/include/__math/inverse_hyperbolic_functions.h
index 5c57da17fb1fa6..21efafe6d7f674 100644
--- a/libcxx/include/__math/inverse_hyperbolic_functions.h
+++ b/libcxx/include/__math/inverse_hyperbolic_functions.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double acosh(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 acosh(_A1 __x) _NOEXCEPT {return __builtin_acosh((double)__x);}
 
 // asinh
@@ -50,7 +50,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double asinh(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 asinh(_A1 __x) _NOEXCEPT {return __builtin_asinh((double)__x);}
 
 // atanh
@@ -66,7 +66,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double atanh(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 atanh(_A1 __x) _NOEXCEPT {return __builtin_atanh((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/inverse_trigonometric_functions.h b/libcxx/include/__math/inverse_trigonometric_functions.h
index bd37187fe50615..45c6abb40c37b8 100644
--- a/libcxx/include/__math/inverse_trigonometric_functions.h
+++ b/libcxx/include/__math/inverse_trigonometric_functions.h
@@ -37,7 +37,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double acos(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 acos(_A1 __x) _NOEXCEPT {return __builtin_acos((double)__x);}
 
 // asin
@@ -53,7 +53,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double asin(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 asin(_A1 __x) _NOEXCEPT {return __builtin_asin((double)__x);}
 
 // atan
@@ -69,7 +69,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double atan(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 atan(_A1 __x) _NOEXCEPT {return __builtin_atan((double)__x);}
 
 // atan2
@@ -85,17 +85,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double atan2(long double __y, long double __x)
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 atan2(_A1 __y, _A2 __x) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::atan2((__result_type)__y, (__result_type)__x);
 }
 

diff  --git a/libcxx/include/__math/logarithms.h b/libcxx/include/__math/logarithms.h
index 49723894f437e0..6583325092a8a9 100644
--- a/libcxx/include/__math/logarithms.h
+++ b/libcxx/include/__math/logarithms.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double log(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 log(_A1 __x) _NOEXCEPT {return __builtin_log((double)__x);}
 
 // log10
@@ -51,7 +51,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double log10(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 log10(_A1 __x) _NOEXCEPT {return __builtin_log10((double)__x);}
 
 // ilogb
@@ -67,7 +67,7 @@ inline _LIBCPP_HIDE_FROM_ABI int ilogb(long double __x) _NOEXCEPT {return __buil
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, int>::type
+typename enable_if<is_integral<_A1>::value, int>::type
 ilogb(_A1 __x) _NOEXCEPT {return __builtin_ilogb((double)__x);}
 
 // log1p
@@ -83,7 +83,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double log1p(long double __x) _NOEXCEPT {retur
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 log1p(_A1 __x) _NOEXCEPT {return __builtin_log1p((double)__x);}
 
 // log2
@@ -99,7 +99,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double log2(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 log2(_A1 __x) _NOEXCEPT {return __builtin_log2((double)__x);}
 
 // logb
@@ -115,7 +115,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double logb(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 logb(_A1 __x) _NOEXCEPT {return __builtin_logb((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/min_max.h b/libcxx/include/__math/min_max.h
index 9c3f72466ce410..d138f9a638f2a8 100644
--- a/libcxx/include/__math/min_max.h
+++ b/libcxx/include/__math/min_max.h
@@ -36,17 +36,17 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fmax(long double
 
 template <class _A1, class _A2>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 fmax(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::fmax((__result_type)__x, (__result_type)__y);
 }
 
@@ -63,17 +63,17 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double fmin(long double
 
 template <class _A1, class _A2>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 fmin(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::fmin((__result_type)__x, (__result_type)__y);
 }
 

diff  --git a/libcxx/include/__math/modulo.h b/libcxx/include/__math/modulo.h
index 63fe3c80b138d0..d3d21184762a82 100644
--- a/libcxx/include/__math/modulo.h
+++ b/libcxx/include/__math/modulo.h
@@ -36,17 +36,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double fmod(long double __x, long double __y)
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 fmod(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::fmod((__result_type)__x, (__result_type)__y);
 }
 

diff  --git a/libcxx/include/__math/remainder.h b/libcxx/include/__math/remainder.h
index 71b8d70097b56c..770cd17ae3c14c 100644
--- a/libcxx/include/__math/remainder.h
+++ b/libcxx/include/__math/remainder.h
@@ -37,17 +37,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double remainder(long double __x, long double
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 remainder(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::remainder((__result_type)__x, (__result_type)__y);
 }
 
@@ -64,17 +64,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double remquo(long double __x, long double __y
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 remquo(_A1 __x, _A2 __y, int* __z) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::remquo((__result_type)__x, (__result_type)__y, __z);
 }
 

diff  --git a/libcxx/include/__math/roots.h b/libcxx/include/__math/roots.h
index c3be03ae253204..a20e9a77006dde 100644
--- a/libcxx/include/__math/roots.h
+++ b/libcxx/include/__math/roots.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double sqrt(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 sqrt(_A1 __x) _NOEXCEPT {return __builtin_sqrt((double)__x);}
 
 // cbrt
@@ -50,7 +50,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double cbrt(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 cbrt(_A1 __x) _NOEXCEPT {return __builtin_cbrt((double)__x);}
 
 } // namespace __math

diff  --git a/libcxx/include/__math/rounding_functions.h b/libcxx/include/__math/rounding_functions.h
index 5db9156dfa2696..910098a68b893f 100644
--- a/libcxx/include/__math/rounding_functions.h
+++ b/libcxx/include/__math/rounding_functions.h
@@ -37,7 +37,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double ceil(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 ceil(_A1 __x) _NOEXCEPT {return __builtin_ceil((double)__x);}
 
 // floor
@@ -53,7 +53,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double floor(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 floor(_A1 __x) _NOEXCEPT {return __builtin_floor((double)__x);}
 
 // llrint
@@ -75,7 +75,7 @@ inline _LIBCPP_HIDE_FROM_ABI long long llrint(long double __x) _NOEXCEPT
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, long long>::type
+typename enable_if<is_integral<_A1>::value, long long>::type
 llrint(_A1 __x) _NOEXCEPT
 {
     return __builtin_llrint((double)__x);
@@ -100,7 +100,7 @@ inline _LIBCPP_HIDE_FROM_ABI long long llround(long double __x) _NOEXCEPT
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, long long>::type
+typename enable_if<is_integral<_A1>::value, long long>::type
 llround(_A1 __x) _NOEXCEPT
 {
     return __builtin_llround((double)__x);
@@ -125,7 +125,7 @@ inline _LIBCPP_HIDE_FROM_ABI long lrint(long double __x) _NOEXCEPT
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, long>::type
+typename enable_if<is_integral<_A1>::value, long>::type
 lrint(_A1 __x) _NOEXCEPT
 {
     return __builtin_lrint((double)__x);
@@ -150,7 +150,7 @@ inline _LIBCPP_HIDE_FROM_ABI long lround(long double __x) _NOEXCEPT
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, long>::type
+typename enable_if<is_integral<_A1>::value, long>::type
 lround(_A1 __x) _NOEXCEPT
 {
     return __builtin_lround((double)__x);
@@ -169,7 +169,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double nearbyint(long do
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 nearbyint(_A1 __x) _NOEXCEPT {return __builtin_nearbyint((double)__x);}
 
 // nextafter
@@ -185,17 +185,17 @@ inline _LIBCPP_HIDE_FROM_ABI long double nextafter(long double __x, long double
 
 template <class _A1, class _A2>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::__enable_if_t
+typename __enable_if_t
 <
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    std::__promote<_A1, _A2>
+    is_arithmetic<_A1>::value &&
+    is_arithmetic<_A2>::value,
+    __promote<_A1, _A2>
 >::type
 nextafter(_A1 __x, _A2 __y) _NOEXCEPT
 {
-    typedef typename std::__promote<_A1, _A2>::type __result_type;
-    static_assert((!(std::_IsSame<_A1, __result_type>::value &&
-                     std::_IsSame<_A2, __result_type>::value)), "");
+    typedef typename __promote<_A1, _A2>::type __result_type;
+    static_assert((!(_IsSame<_A1, __result_type>::value &&
+                     _IsSame<_A2, __result_type>::value)), "");
     return __math::nextafter((__result_type)__x, (__result_type)__y);
 }
 
@@ -212,7 +212,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double nexttoward(long double __x, long double
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 nexttoward(_A1 __x, long double __y) _NOEXCEPT {return __builtin_nexttoward((double)__x, __y);}
 
 // rint
@@ -234,7 +234,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double rint(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 rint(_A1 __x) _NOEXCEPT
 {
     return __builtin_rint((double)__x);
@@ -259,7 +259,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double round(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 round(_A1 __x) _NOEXCEPT
 {
     return __builtin_round((double)__x);
@@ -284,7 +284,7 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI long double trunc(long double
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 trunc(_A1 __x) _NOEXCEPT
 {
     return __builtin_trunc((double)__x);

diff  --git a/libcxx/include/__math/traits.h b/libcxx/include/__math/traits.h
index 2e9e778469dcb7..95080f11a8d437 100644
--- a/libcxx/include/__math/traits.h
+++ b/libcxx/include/__math/traits.h
@@ -28,17 +28,17 @@ namespace __math {
 
 // signbit
 
-template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_floating_point<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1 __x) _NOEXCEPT {
   return __builtin_signbit(__x);
 }
 
-template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value && std::is_signed<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_integral<_A1>::value && is_signed<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1 __x) _NOEXCEPT {
   return __x < 0;
 }
 
-template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value && !std::is_signed<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_integral<_A1>::value && !is_signed<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1) _NOEXCEPT {
   return false;
 }
@@ -46,13 +46,13 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool signbit(_A1) _NOEXCEPT {
 // isfinite
 
 template <class _A1,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && numeric_limits<_A1>::has_infinity, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isfinite(_A1 __x) _NOEXCEPT {
-  return __builtin_isfinite((typename std::__promote<_A1>::type)__x);
+  return __builtin_isfinite((typename __promote<_A1>::type)__x);
 }
 
 template <class _A1,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && !numeric_limits<_A1>::has_infinity, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isfinite(_A1) _NOEXCEPT {
   return true;
 }
@@ -60,14 +60,14 @@ _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool i
 // isinf
 
 template <class _A1,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::numeric_limits<_A1>::has_infinity, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && numeric_limits<_A1>::has_infinity, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isinf(_A1 __x) _NOEXCEPT {
-  return __builtin_isinf((typename std::__promote<_A1>::type)__x);
+  return __builtin_isinf((typename __promote<_A1>::type)__x);
 }
 
 template <class _A1>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI
-    typename std::enable_if< std::is_arithmetic<_A1>::value && !std::numeric_limits<_A1>::has_infinity, bool>::type
+    typename enable_if< is_arithmetic<_A1>::value && !numeric_limits<_A1>::has_infinity, bool>::type
     isinf(_A1) _NOEXCEPT {
   return false;
 }
@@ -88,12 +88,12 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI
 
 // isnan
 
-template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_floating_point<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(_A1 __x) _NOEXCEPT {
   return __builtin_isnan(__x);
 }
 
-template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_integral<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnan(_A1) _NOEXCEPT {
   return false;
 }
@@ -114,12 +114,12 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI
 
 // isnormal
 
-template <class _A1, std::__enable_if_t<std::is_floating_point<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_floating_point<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnormal(_A1 __x) _NOEXCEPT {
   return __builtin_isnormal(__x);
 }
 
-template <class _A1, std::__enable_if_t<std::is_integral<_A1>::value, int> = 0>
+template <class _A1, __enable_if_t<is_integral<_A1>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool isnormal(_A1 __x) _NOEXCEPT {
   return __x != 0;
 }
@@ -128,9 +128,9 @@ _LIBCPP_NODISCARD_EXT _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool i
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreater(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_isgreater((type)__x, (type)__y);
 }
 
@@ -138,9 +138,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreater(_A1 __x, _A2 _
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreaterequal(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_isgreaterequal((type)__x, (type)__y);
 }
 
@@ -148,9 +148,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isgreaterequal(_A1 __x,
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isless(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_isless((type)__x, (type)__y);
 }
 
@@ -158,9 +158,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isless(_A1 __x, _A2 __y)
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessequal(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_islessequal((type)__x, (type)__y);
 }
 
@@ -168,9 +168,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessequal(_A1 __x, _A2
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessgreater(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_islessgreater((type)__x, (type)__y);
 }
 
@@ -178,9 +178,9 @@ _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool islessgreater(_A1 __x, _
 
 template <class _A1,
           class _A2,
-          std::__enable_if_t<std::is_arithmetic<_A1>::value && std::is_arithmetic<_A2>::value, int> = 0>
+          __enable_if_t<is_arithmetic<_A1>::value && is_arithmetic<_A2>::value, int> = 0>
 _LIBCPP_NODISCARD_EXT inline _LIBCPP_HIDE_FROM_ABI bool isunordered(_A1 __x, _A2 __y) _NOEXCEPT {
-  typedef typename std::__promote<_A1, _A2>::type type;
+  typedef typename __promote<_A1, _A2>::type type;
   return __builtin_isunordered((type)__x, (type)__y);
 }
 

diff  --git a/libcxx/include/__math/trigonometric_functions.h b/libcxx/include/__math/trigonometric_functions.h
index 985b968c82d3ee..2c3b3bb7bbb1b8 100644
--- a/libcxx/include/__math/trigonometric_functions.h
+++ b/libcxx/include/__math/trigonometric_functions.h
@@ -34,7 +34,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double cos(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 cos(_A1 __x) _NOEXCEPT {return __builtin_cos((double)__x);}
 
 // sin
@@ -50,7 +50,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double sin(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 sin(_A1 __x) _NOEXCEPT {return __builtin_sin((double)__x);}
 
 // tan
@@ -66,7 +66,7 @@ inline _LIBCPP_HIDE_FROM_ABI long double tan(long double __x) _NOEXCEPT {return
 
 template <class _A1>
 inline _LIBCPP_HIDE_FROM_ABI
-typename std::enable_if<std::is_integral<_A1>::value, double>::type
+typename enable_if<is_integral<_A1>::value, double>::type
 tan(_A1 __x) _NOEXCEPT {return __builtin_tan((double)__x);}
 
 } // namespace __math


        


More information about the libcxx-commits mailing list