From 2d2d7fbc283315b676159716376e739d3d23ed94 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Fri, 23 Aug 2019 11:38:04 -0700 Subject: Export of internal Abseil changes -- d6748c733a70cd74ad9b76a0c9cd6b3fe2cecacf by Xiaoyi Zhang : Remove empty block, to address alerts reported in https://github.com/abseil/abseil-cpp/issues/368. PiperOrigin-RevId: 265099887 -- 232e2036b5668d6d1296b881f9347756d84541ee by Derek Mauro : Make the Linux Bazel CI scripts test with the exception mode explicitly set. PiperOrigin-RevId: 265092105 -- 942a40696c2c9b833be03e92d22a6ede7bccb6d4 by Xiaoyi Zhang : Import https://github.com/abseil/abseil-cpp/pull/372. Suppress the unused variable warning on GCC, i.e. "-Wunused-variable". PiperOrigin-RevId: 265063925 -- 7ef90796b52cbdc260afc77cf47206f9356471d0 by Xiaoyi Zhang : Add quotes to `ABSL_COMMON_INCLUDE_DIRS` since it's a list and may contain a `;`. This addresses https://github.com/abseil/abseil-cpp/issues/373. PiperOrigin-RevId: 265059077 -- 43f3ae742e00b83672ad6c5bc5b17fdb8f9fe6fe by Gennadiy Rozental : Internal re-organization PiperOrigin-RevId: 264913945 -- 6a2adf9c08ee1d98cc6b2855a676345c6495294a by Andy Soffer : Publicly expose type names for uniform interval tags as in, for example, absl::IntervalClosedClosedTag, and add equality comparison operators. PiperOrigin-RevId: 264861162 -- 3c90c6e05fd61d56b419cd2d39dab8f17b8711b8 by Abseil Team : Add validity check on returned frame pointer. PiperOrigin-RevId: 264858823 -- 2db87e0cfa0c6bea7ba81684b834cb8a73b7d748 by Gennadiy Rozental : Add MUST_USE_RESULT attribute to absl::GetFlag to prevent accidental misuse. PiperOrigin-RevId: 264782762 GitOrigin-RevId: d6748c733a70cd74ad9b76a0c9cd6b3fe2cecacf Change-Id: I169e9c5358e4f63000c1255e806d26b8afecf5ff --- absl/random/distributions.h | 19 +++++------- absl/random/distributions_test.cc | 19 +++++------- absl/random/internal/uniform_helper.h | 57 ++++++++++++++++++++++++----------- 3 files changed, 53 insertions(+), 42 deletions(-) (limited to 'absl/random') diff --git a/absl/random/distributions.h b/absl/random/distributions.h index d8ba3cd..18ff248 100644 --- a/absl/random/distributions.h +++ b/absl/random/distributions.h @@ -68,18 +68,13 @@ namespace absl { -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalClosedClosedT, - IntervalClosedClosed, {}); -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalClosedClosedT, - IntervalClosed, {}); -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalClosedOpenT, - IntervalClosedOpen, {}); -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalOpenOpenT, - IntervalOpenOpen, {}); -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalOpenOpenT, - IntervalOpen, {}); -ABSL_INTERNAL_INLINE_CONSTEXPR(random_internal::IntervalOpenClosedT, - IntervalOpenClosed, {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalClosedClosedTag, IntervalClosedClosed, + {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalClosedClosedTag, IntervalClosed, {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalClosedOpenTag, IntervalClosedOpen, {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalOpenOpenTag, IntervalOpenOpen, {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalOpenOpenTag, IntervalOpen, {}); +ABSL_INTERNAL_INLINE_CONSTEXPR(IntervalOpenClosedTag, IntervalOpenClosed, {}); // ----------------------------------------------------------------------------- // absl::Uniform(tag, bitgen, lo, hi) diff --git a/absl/random/distributions_test.cc b/absl/random/distributions_test.cc index eb82868..2d92723 100644 --- a/absl/random/distributions_test.cc +++ b/absl/random/distributions_test.cc @@ -171,14 +171,11 @@ void CheckArgsInferType() { ""); static_assert( absl::conjunction< + std::is_same(0))>, std::is_same( - 0))>, - std::is_same( - 0))>>::value, + absl::IntervalOpenOpenTag, B, A>(0))>>::value, ""); } @@ -218,12 +215,10 @@ void CheckArgsReturnExpectedType() { absl::conjunction< std::is_same(0))>, - std::is_same(0))>>::value, + absl::IntervalOpenOpenTag, A, B, Expect>(0))>, + std::is_same(0))>>::value, ""); } diff --git a/absl/random/internal/uniform_helper.h b/absl/random/internal/uniform_helper.h index ebcc374..9e89e52 100644 --- a/absl/random/internal/uniform_helper.h +++ b/absl/random/internal/uniform_helper.h @@ -30,12 +30,33 @@ class uniform_real_distribution; // Interval tag types which specify whether the interval is open or closed // on either boundary. + namespace random_internal { -struct IntervalClosedClosedT {}; -struct IntervalClosedOpenT {}; -struct IntervalOpenClosedT {}; -struct IntervalOpenOpenT {}; +template +struct TagTypeCompare {}; + +template +constexpr bool operator==(TagTypeCompare, TagTypeCompare) { + // Tags are mono-states. They always compare equal. + return true; +} +template +constexpr bool operator!=(TagTypeCompare, TagTypeCompare) { + return false; +} +} // namespace random_internal + +struct IntervalClosedClosedTag + : public random_internal::TagTypeCompare {}; +struct IntervalClosedOpenTag + : public random_internal::TagTypeCompare {}; +struct IntervalOpenClosedTag + : public random_internal::TagTypeCompare {}; +struct IntervalOpenOpenTag + : public random_internal::TagTypeCompare {}; + +namespace random_internal { // The functions // uniform_lower_bound(tag, a, b) // and @@ -56,8 +77,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_integral, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, IntType> uniform_lower_bound(Tag, IntType a, IntType) { return a + 1; @@ -67,8 +88,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_floating_point, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, FloatType> uniform_lower_bound(Tag, FloatType a, FloatType b) { return std::nextafter(a, b); @@ -76,8 +97,8 @@ uniform_lower_bound(Tag, FloatType a, FloatType b) { template typename absl::enable_if_t< - absl::disjunction, - std::is_same>::value, + absl::disjunction, + std::is_same>::value, NumType> uniform_lower_bound(Tag, NumType a, NumType) { return a; @@ -87,8 +108,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_integral, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, IntType> uniform_upper_bound(Tag, IntType, IntType b) { return b - 1; @@ -98,8 +119,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_floating_point, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, FloatType> uniform_upper_bound(Tag, FloatType, FloatType b) { return b; @@ -109,8 +130,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_integral, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, IntType> uniform_upper_bound(Tag, IntType, IntType b) { return b; @@ -120,8 +141,8 @@ template typename absl::enable_if_t< absl::conjunction< std::is_floating_point, - absl::disjunction, - std::is_same>>::value, + absl::disjunction, + std::is_same>>::value, FloatType> uniform_upper_bound(Tag, FloatType, FloatType b) { return std::nextafter(b, (std::numeric_limits::max)()); -- cgit v1.2.3