Move undefs next to function definitions

petrhosek · petrhosek · commit 745745c5df98 · 2024-06-05T14:09:30.000-07:00
diff --git a/libcxx/include/__math/abs.h b/libcxx/include/__math/abs.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // fabs
 
+#undef fabs
+
 _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float fabs(float __x) _NOEXCEPT { return __builtin_fabsf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/copysign.h b/libcxx/include/__math/copysign.h
@@ -25,6 +25,8 @@ namespace __math {
 
 // copysign
 
+#undef copysign
+
 _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float copysign(float __x, float __y) _NOEXCEPT {
   return ::__builtin_copysignf(__x, __y);
 }
diff --git a/libcxx/include/__math/error_functions.h b/libcxx/include/__math/error_functions.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // erf
 
+#undef erf
+
 inline _LIBCPP_HIDE_FROM_ABI float erf(float __x) _NOEXCEPT { return __builtin_erff(__x); }
 
 template <class = int>
@@ -39,6 +41,8 @@ inline _LIBCPP_HIDE_FROM_ABI double erf(_A1 __x) _NOEXCEPT {
 
 // erfc
 
+#undef erfc
+
 inline _LIBCPP_HIDE_FROM_ABI float erfc(float __x) _NOEXCEPT { return __builtin_erfcf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/exponential_functions.h b/libcxx/include/__math/exponential_functions.h
@@ -26,6 +26,8 @@ namespace __math {
 
 // exp
 
+#undef exp
+
 inline _LIBCPP_HIDE_FROM_ABI float exp(float __x) _NOEXCEPT { return __builtin_expf(__x); }
 
 template <class = int>
@@ -42,6 +44,8 @@ inline _LIBCPP_HIDE_FROM_ABI double exp(_A1 __x) _NOEXCEPT {
 
 // frexp
 
+#undef frexp
+
 inline _LIBCPP_HIDE_FROM_ABI float frexp(float __x, int* __e) _NOEXCEPT { return __builtin_frexpf(__x, __e); }
 
 template <class = int>
@@ -60,6 +64,8 @@ inline _LIBCPP_HIDE_FROM_ABI double frexp(_A1 __x, int* __e) _NOEXCEPT {
 
 // ldexp
 
+#undef ldexp
+
 inline _LIBCPP_HIDE_FROM_ABI float ldexp(float __x, int __e) _NOEXCEPT { return __builtin_ldexpf(__x, __e); }
 
 template <class = int>
@@ -78,6 +84,8 @@ inline _LIBCPP_HIDE_FROM_ABI double ldexp(_A1 __x, int __e) _NOEXCEPT {
 
 // exp2
 
+#undef exp2
+
 inline _LIBCPP_HIDE_FROM_ABI float exp2(float __x) _NOEXCEPT { return __builtin_exp2f(__x); }
 
 template <class = int>
@@ -94,6 +102,8 @@ inline _LIBCPP_HIDE_FROM_ABI double exp2(_A1 __x) _NOEXCEPT {
 
 // expm1
 
+#undef expm1
+
 inline _LIBCPP_HIDE_FROM_ABI float expm1(float __x) _NOEXCEPT { return __builtin_expm1f(__x); }
 
 template <class = int>
@@ -110,6 +120,8 @@ inline _LIBCPP_HIDE_FROM_ABI double expm1(_A1 __x) _NOEXCEPT {
 
 // scalbln
 
+#undef scalbln
+
 inline _LIBCPP_HIDE_FROM_ABI float scalbln(float __x, long __y) _NOEXCEPT { return __builtin_scalblnf(__x, __y); }
 
 template <class = int>
@@ -128,6 +140,8 @@ inline _LIBCPP_HIDE_FROM_ABI double scalbln(_A1 __x, long __y) _NOEXCEPT {
 
 // scalbn
 
+#undef scalbn
+
 inline _LIBCPP_HIDE_FROM_ABI float scalbn(float __x, int __y) _NOEXCEPT { return __builtin_scalbnf(__x, __y); }
 
 template <class = int>
@@ -146,6 +160,8 @@ inline _LIBCPP_HIDE_FROM_ABI double scalbn(_A1 __x, int __y) _NOEXCEPT {
 
 // pow
 
+#undef pow
+
 inline _LIBCPP_HIDE_FROM_ABI float pow(float __x, float __y) _NOEXCEPT { return __builtin_powf(__x, __y); }
 
 template <class = int>
diff --git a/libcxx/include/__math/fdim.h b/libcxx/include/__math/fdim.h
@@ -23,6 +23,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace __math {
 
+// fdim
+
+#undef fdim
+
 inline _LIBCPP_HIDE_FROM_ABI float fdim(float __x, float __y) _NOEXCEPT { return __builtin_fdimf(__x, __y); }
 
 template <class = int>
diff --git a/libcxx/include/__math/fma.h b/libcxx/include/__math/fma.h
@@ -23,6 +23,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace __math {
 
+// fma
+
+#undef fma
+
 inline _LIBCPP_HIDE_FROM_ABI float fma(float __x, float __y, float __z) _NOEXCEPT {
   return __builtin_fmaf(__x, __y, __z);
 }
diff --git a/libcxx/include/__math/gamma.h b/libcxx/include/__math/gamma.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // lgamma
 
+#undef lgamma
+
 inline _LIBCPP_HIDE_FROM_ABI float lgamma(float __x) _NOEXCEPT { return __builtin_lgammaf(__x); }
 
 template <class = int>
@@ -41,6 +43,8 @@ inline _LIBCPP_HIDE_FROM_ABI double lgamma(_A1 __x) _NOEXCEPT {
 
 // tgamma
 
+#undef tgamma
+
 inline _LIBCPP_HIDE_FROM_ABI float tgamma(float __x) _NOEXCEPT { return __builtin_tgammaf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/hyperbolic_functions.h b/libcxx/include/__math/hyperbolic_functions.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // cosh
 
+#undef cosh
+
 inline _LIBCPP_HIDE_FROM_ABI float cosh(float __x) _NOEXCEPT { return __builtin_coshf(__x); }
 
 template <class = int>
@@ -39,6 +41,8 @@ inline _LIBCPP_HIDE_FROM_ABI double cosh(_A1 __x) _NOEXCEPT {
 
 // sinh
 
+#undef sinh
+
 inline _LIBCPP_HIDE_FROM_ABI float sinh(float __x) _NOEXCEPT { return __builtin_sinhf(__x); }
 
 template <class = int>
@@ -55,6 +59,8 @@ inline _LIBCPP_HIDE_FROM_ABI double sinh(_A1 __x) _NOEXCEPT {
 
 // tanh
 
+#undef tanh
+
 inline _LIBCPP_HIDE_FROM_ABI float tanh(float __x) _NOEXCEPT { return __builtin_tanhf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/hypot.h b/libcxx/include/__math/hypot.h
@@ -23,6 +23,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace __math {
 
+// hypot
+
+#undef hypot
+
 inline _LIBCPP_HIDE_FROM_ABI float hypot(float __x, float __y) _NOEXCEPT { return __builtin_hypotf(__x, __y); }
 
 template <class = int>
diff --git a/libcxx/include/__math/inverse_hyperbolic_functions.h b/libcxx/include/__math/inverse_hyperbolic_functions.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // acosh
 
+#undef acosh
+
 inline _LIBCPP_HIDE_FROM_ABI float acosh(float __x) _NOEXCEPT { return __builtin_acoshf(__x); }
 
 template <class = int>
@@ -39,6 +41,8 @@ inline _LIBCPP_HIDE_FROM_ABI double acosh(_A1 __x) _NOEXCEPT {
 
 // asinh
 
+#undef asinh
+
 inline _LIBCPP_HIDE_FROM_ABI float asinh(float __x) _NOEXCEPT { return __builtin_asinhf(__x); }
 
 template <class = int>
@@ -55,6 +59,8 @@ inline _LIBCPP_HIDE_FROM_ABI double asinh(_A1 __x) _NOEXCEPT {
 
 // atanh
 
+#undef atanh
+
 inline _LIBCPP_HIDE_FROM_ABI float atanh(float __x) _NOEXCEPT { return __builtin_atanhf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/inverse_trigonometric_functions.h b/libcxx/include/__math/inverse_trigonometric_functions.h
@@ -26,6 +26,8 @@ namespace __math {
 
 // acos
 
+#undef acos
+
 inline _LIBCPP_HIDE_FROM_ABI float acos(float __x) _NOEXCEPT { return __builtin_acosf(__x); }
 
 template <class = int>
@@ -42,6 +44,8 @@ inline _LIBCPP_HIDE_FROM_ABI double acos(_A1 __x) _NOEXCEPT {
 
 // asin
 
+#undef asin
+
 inline _LIBCPP_HIDE_FROM_ABI float asin(float __x) _NOEXCEPT { return __builtin_asinf(__x); }
 
 template <class = int>
@@ -58,6 +62,8 @@ inline _LIBCPP_HIDE_FROM_ABI double asin(_A1 __x) _NOEXCEPT {
 
 // atan
 
+#undef atan
+
 inline _LIBCPP_HIDE_FROM_ABI float atan(float __x) _NOEXCEPT { return __builtin_atanf(__x); }
 
 template <class = int>
@@ -74,6 +80,8 @@ inline _LIBCPP_HIDE_FROM_ABI double atan(_A1 __x) _NOEXCEPT {
 
 // atan2
 
+#undef atan2
+
 inline _LIBCPP_HIDE_FROM_ABI float atan2(float __y, float __x) _NOEXCEPT { return __builtin_atan2f(__y, __x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/logarithms.h b/libcxx/include/__math/logarithms.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // log
 
+#undef log
+
 inline _LIBCPP_HIDE_FROM_ABI float log(float __x) _NOEXCEPT { return __builtin_logf(__x); }
 
 template <class = int>
@@ -39,6 +41,8 @@ inline _LIBCPP_HIDE_FROM_ABI double log(_A1 __x) _NOEXCEPT {
 
 // log10
 
+#undef log10
+
 inline _LIBCPP_HIDE_FROM_ABI float log10(float __x) _NOEXCEPT { return __builtin_log10f(__x); }
 
 template <class = int>
@@ -55,6 +59,8 @@ inline _LIBCPP_HIDE_FROM_ABI double log10(_A1 __x) _NOEXCEPT {
 
 // ilogb
 
+#undef ilogb
+
 inline _LIBCPP_HIDE_FROM_ABI int ilogb(float __x) _NOEXCEPT { return __builtin_ilogbf(__x); }
 
 template <class = int>
@@ -71,6 +77,8 @@ inline _LIBCPP_HIDE_FROM_ABI int ilogb(_A1 __x) _NOEXCEPT {
 
 // log1p
 
+#undef log1p
+
 inline _LIBCPP_HIDE_FROM_ABI float log1p(float __x) _NOEXCEPT { return __builtin_log1pf(__x); }
 
 template <class = int>
@@ -87,6 +95,8 @@ inline _LIBCPP_HIDE_FROM_ABI double log1p(_A1 __x) _NOEXCEPT {
 
 // log2
 
+#undef log2
+
 inline _LIBCPP_HIDE_FROM_ABI float log2(float __x) _NOEXCEPT { return __builtin_log2f(__x); }
 
 template <class = int>
@@ -103,6 +113,8 @@ inline _LIBCPP_HIDE_FROM_ABI double log2(_A1 __x) _NOEXCEPT {
 
 // logb
 
+#undef logb
+
 inline _LIBCPP_HIDE_FROM_ABI float logb(float __x) _NOEXCEPT { return __builtin_logbf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/min_max.h b/libcxx/include/__math/min_max.h
@@ -25,6 +25,8 @@ namespace __math {
 
 // fmax
 
+#undef fmax
+
 _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float fmax(float __x, float __y) _NOEXCEPT {
   return __builtin_fmaxf(__x, __y);
 }
@@ -47,6 +49,8 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::typ
 
 // fmin
 
+#undef fmin
+
 _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float fmin(float __x, float __y) _NOEXCEPT {
   return __builtin_fminf(__x, __y);
 }
diff --git a/libcxx/include/__math/modulo.h b/libcxx/include/__math/modulo.h
@@ -25,6 +25,8 @@ namespace __math {
 
 // fmod
 
+#undef fmod
+
 inline _LIBCPP_HIDE_FROM_ABI float fmod(float __x, float __y) _NOEXCEPT { return __builtin_fmodf(__x, __y); }
 
 template <class = int>
@@ -45,6 +47,8 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type fmod(_A1 __x, _A
 
 // modf
 
+#undef modf
+
 inline _LIBCPP_HIDE_FROM_ABI float modf(float __x, float* __y) _NOEXCEPT { return __builtin_modff(__x, __y); }
 
 template <class = int>
diff --git a/libcxx/include/__math/remainder.h b/libcxx/include/__math/remainder.h
@@ -26,6 +26,8 @@ namespace __math {
 
 // remainder
 
+#undef remainder
+
 inline _LIBCPP_HIDE_FROM_ABI float remainder(float __x, float __y) _NOEXCEPT { return __builtin_remainderf(__x, __y); }
 
 template <class = int>
@@ -46,6 +48,8 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type remainder(_A1 __
 
 // remquo
 
+#undef remquo
+
 inline _LIBCPP_HIDE_FROM_ABI float remquo(float __x, float __y, int* __z) _NOEXCEPT {
   return __builtin_remquof(__x, __y, __z);
 }
diff --git a/libcxx/include/__math/roots.h b/libcxx/include/__math/roots.h
@@ -23,6 +23,8 @@ namespace __math {
 
 // sqrt
 
+#undef sqrt
+
 inline _LIBCPP_HIDE_FROM_ABI float sqrt(float __x) _NOEXCEPT { return __builtin_sqrtf(__x); }
 
 template <class = int>
@@ -39,6 +41,8 @@ inline _LIBCPP_HIDE_FROM_ABI double sqrt(_A1 __x) _NOEXCEPT {
 
 // cbrt
 
+#undef cbrt
+
 _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float cbrt(float __x) _NOEXCEPT { return __builtin_cbrtf(__x); }
 
 template <class = int>
diff --git a/libcxx/include/__math/rounding_functions.h b/libcxx/include/__math/rounding_functions.h
diff --git a/libcxx/include/__math/traits.h b/libcxx/include/__math/traits.h
diff --git a/libcxx/include/__math/trigonometric_functions.h b/libcxx/include/__math/trigonometric_functions.h
diff --git a/libcxx/include/math.h b/libcxx/include/math.h

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ namespace __math {`
`25`	`25`
`26`	`26`	`// copysign`
`27`	`27`
	`28`	`+#undef copysign`
	`29`	`+`
`28`	`30`	`_LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI float copysign(float __x, float __y) _NOEXCEPT {`
`29`	`31`	`return ::__builtin_copysignf(__x, __y);`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD`
`23`	`23`
`24`	`24`	`namespace __math {`
`25`	`25`
	`26`	`+// fma`
	`27`	`+`
	`28`	`+#undef fma`
	`29`	`+`
`26`	`30`	`inline _LIBCPP_HIDE_FROM_ABI float fma(float __x, float __y, float __z) _NOEXCEPT {`
`27`	`31`	`return __builtin_fmaf(__x, __y, __z);`
`28`	`32`	`}`