Skip to content

Commit 9b74b94

Browse files
committed
[libc++] Use using declarations to pull in functions from the numeric_limits base class
1 parent 03742c5 commit 9b74b94

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

libcxx/include/limits

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ class numeric_limits : private __libcpp_numeric_limits<_Tp> {
455455

456456
public:
457457
static inline _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
458-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type min() _NOEXCEPT { return __base::min(); }
459-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type max() _NOEXCEPT { return __base::max(); }
460-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT { return __base::lowest(); }
458+
using __base::lowest;
459+
using __base::max;
460+
using __base::min;
461461

462462
static inline _LIBCPP_CONSTEXPR const int digits = __base::digits;
463463
static inline _LIBCPP_CONSTEXPR const int digits10 = __base::digits10;
@@ -466,12 +466,8 @@ public:
466466
static inline _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
467467
static inline _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
468468
static inline _LIBCPP_CONSTEXPR const int radix = __base::radix;
469-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {
470-
return __base::epsilon();
471-
}
472-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {
473-
return __base::round_error();
474-
}
469+
using __base::epsilon;
470+
using __base::round_error;
475471

476472
static inline _LIBCPP_CONSTEXPR const int min_exponent = __base::min_exponent;
477473
static inline _LIBCPP_CONSTEXPR const int min_exponent10 = __base::min_exponent10;
@@ -485,18 +481,10 @@ public:
485481
static inline _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
486482
static inline _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
487483
_LIBCPP_SUPPRESS_DEPRECATED_POP
488-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {
489-
return __base::infinity();
490-
}
491-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {
492-
return __base::quiet_NaN();
493-
}
494-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {
495-
return __base::signaling_NaN();
496-
}
497-
[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {
498-
return __base::denorm_min();
499-
}
484+
using __base::denorm_min;
485+
using __base::infinity;
486+
using __base::quiet_NaN;
487+
using __base::signaling_NaN;
500488

501489
static inline _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
502490
static inline _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;

0 commit comments

Comments
 (0)