From 26b789f9a53d086c8b8c9c2668efb251e37861cd Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Fri, 4 May 2018 09:58:56 -0700 Subject: - 07191b0f52301e1e4a790e236f7b7c2fd90561ae Disambiguates computed return type of absl::optional logi... by Abseil Team - acd95f8ec4e6ec1587cb198c7f40af3c81094d92 Release container benchmarks. by Alex Strelnikov - 80f596b6b7c5e06453e778c16527d5a0e85f8413 Allow absl::base_internal::AtomicHook to have a default v... by Derek Mauro - 8402631546af8bcbd4acdf897d0cdfb805ad544a Release thread_identity benchmark. by Alex Strelnikov - 6dcb1e90fefb8556ce4654983d3a73c7585b4b99 Fix spelling error in variant.h by Abseil Team - faa8a81e1442018c0d400b09a595a5be55074715 Run tests from CMake. The CI is currently Linux only, fo... by Jon Cohen - 745ed6db574f931f2ec3a88e964fb03a5f22f816 Internal change. by Derek Mauro - 23facd7d1c5f43ac8181b016ee4acc5955f048c1 absl::variant exception safety test. by Xiaoyi Zhang - c18e21e7cf8f6e83ae9d90e536e886409dd6cf68 Reinstate the syntax check on time-zone abbreviations now... by Abseil Team - da469f4314f0c820665a2b5b9477af9462b23e42 Import CCTZ changes to internal copy. by Shaindel Schwartz - 44ea35843517be03ab256b69449ccfea64352621 Import CCTZ changes to internal copy. by Abseil Team - 55d1105312687c6093950fac831c7540f49045b5 Import CCTZ changes to internal copy. by Greg Falcon - 58d7965ad274406410b6d833213eca04d41c6867 Add zoneinfo as a data dependency to the //absl/time tests. by Shaindel Schwartz - 6acc50146f9ff29015bfaaa5bf9900691f839da5 Change benchmark target type from cc_test to cc_binary. by Alex Strelnikov - db3fbdae8f9f285a466f7a070326b1ce43b6a0dd Update WORKSPACE for C++ microbenchmarks and release algo... by Alex Strelnikov - 0869ae168255242af651853ed01719166d8cebf6 Update to Bazel version 0.13.0. by Abseil Team - e507dd53ab788964207fdf27d31b72a33c296fab Add missing include of cstdio by Abseil Team GitOrigin-RevId: 07191b0f52301e1e4a790e236f7b7c2fd90561ae Change-Id: I90994cf2b438fbec894724dcd9b90882281eef56 --- absl/types/optional.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'absl/types/optional.h') diff --git a/absl/types/optional.h b/absl/types/optional.h index 98b29e5..4dcf479 100644 --- a/absl/types/optional.h +++ b/absl/types/optional.h @@ -958,7 +958,8 @@ constexpr auto operator==(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x == *y)) { return static_cast(x) != static_cast(y) ? false - : static_cast(x) == false ? true : *x == *y; + : static_cast(x) == false ? true + : static_cast(*x == *y); } // Returns: If bool(x) != bool(y), true; otherwise, if bool(x) == false, false; @@ -968,31 +969,32 @@ constexpr auto operator!=(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x != *y)) { return static_cast(x) != static_cast(y) ? true - : static_cast(x) == false ? false : *x != *y; + : static_cast(x) == false ? false + : static_cast(*x != *y); } // Returns: If !y, false; otherwise, if !x, true; otherwise *x < *y. template constexpr auto operator<(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x < *y)) { - return !y ? false : !x ? true : *x < *y; + return !y ? false : !x ? true : static_cast(*x < *y); } // Returns: If !x, false; otherwise, if !y, true; otherwise *x > *y. template constexpr auto operator>(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x > *y)) { - return !x ? false : !y ? true : *x > *y; + return !x ? false : !y ? true : static_cast(*x > *y); } // Returns: If !x, true; otherwise, if !y, false; otherwise *x <= *y. template constexpr auto operator<=(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x <= *y)) { - return !x ? true : !y ? false : *x <= *y; + return !x ? true : !y ? false : static_cast(*x <= *y); } // Returns: If !y, true; otherwise, if !x, false; otherwise *x >= *y. template constexpr auto operator>=(const optional& x, const optional& y) -> decltype(optional_internal::convertible_to_bool(*x >= *y)) { - return !y ? true : !x ? false : *x >= *y; + return !y ? true : !x ? false : static_cast(*x >= *y); } // Comparison with nullopt [optional.nullops] @@ -1054,62 +1056,62 @@ constexpr bool operator>=(nullopt_t, const optional& x) noexcept { template constexpr auto operator==(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x == v)) { - return static_cast(x) ? *x == v : false; + return static_cast(x) ? static_cast(*x == v) : false; } template constexpr auto operator==(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v == *x)) { - return static_cast(x) ? v == *x : false; + return static_cast(x) ? static_cast(v == *x) : false; } template constexpr auto operator!=(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x != v)) { - return static_cast(x) ? *x != v : true; + return static_cast(x) ? static_cast(*x != v) : true; } template constexpr auto operator!=(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v != *x)) { - return static_cast(x) ? v != *x : true; + return static_cast(x) ? static_cast(v != *x) : true; } template constexpr auto operator<(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x < v)) { - return static_cast(x) ? *x < v : true; + return static_cast(x) ? static_cast(*x < v) : true; } template constexpr auto operator<(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v < *x)) { - return static_cast(x) ? v < *x : false; + return static_cast(x) ? static_cast(v < *x) : false; } template constexpr auto operator<=(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x <= v)) { - return static_cast(x) ? *x <= v : true; + return static_cast(x) ? static_cast(*x <= v) : true; } template constexpr auto operator<=(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v <= *x)) { - return static_cast(x) ? v <= *x : false; + return static_cast(x) ? static_cast(v <= *x) : false; } template constexpr auto operator>(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x > v)) { - return static_cast(x) ? *x > v : false; + return static_cast(x) ? static_cast(*x > v) : false; } template constexpr auto operator>(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v > *x)) { - return static_cast(x) ? v > *x : true; + return static_cast(x) ? static_cast(v > *x) : true; } template constexpr auto operator>=(const optional& x, const U& v) -> decltype(optional_internal::convertible_to_bool(*x >= v)) { - return static_cast(x) ? *x >= v : false; + return static_cast(x) ? static_cast(*x >= v) : false; } template constexpr auto operator>=(const U& v, const optional& x) -> decltype(optional_internal::convertible_to_bool(v >= *x)) { - return static_cast(x) ? v >= *x : true; + return static_cast(x) ? static_cast(v >= *x) : true; } } // namespace absl -- cgit v1.2.3