From 0fa86cac406d12de03ed670bbd2af3be7c848c03 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Fri, 2 Feb 2018 10:36:07 -0800 Subject: Changes imported from Abseil "staging" branch: - 14488f5397315b265d57b50e6796890107e0efb2 Clarify comment on absl::NormalizeLogSeverity. by Abseil Team - 401dcf3fdb121e8356e8f54c9f2838faad9ffdf7 Internal change. by Alex Strelnikov - 1401400b77f8cb5d11fac414c89ffc3b55713f41 Remove unnecessary extern specifier on function declarati... by Alex Strelnikov - 97d1079d0e8930b1d77bda7bac5e4d15e0e74278 Add missing explicit casts between signed and unsigned in... by Alex Strelnikov - 47c4138142900de510e4c5426b4bf606252d7dac Internal change. by Alex Strelnikov - 40eb2555499a000adb78a6581215c701fa818568 Documentation fixes for `absl::optional`, for the `value_... by Abseil Team GitOrigin-RevId: 14488f5397315b265d57b50e6796890107e0efb2 Change-Id: I3c11216c0c6ef5633aa5cc3b7f5977fa4a3ea1f5 --- absl/numeric/int128.h | 52 ++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'absl/numeric') diff --git a/absl/numeric/int128.h b/absl/numeric/int128.h index 5e1b3f03..bbb76edb 100644 --- a/absl/numeric/int128.h +++ b/absl/numeric/int128.h @@ -206,7 +206,7 @@ class alignas(16) uint128 { extern const uint128 kuint128max; // allow uint128 to be logged -extern std::ostream& operator<<(std::ostream& os, uint128 v); +std::ostream& operator<<(std::ostream& os, uint128 v); // TODO(strel) add operator>>(std::istream&, uint128) @@ -287,55 +287,61 @@ constexpr uint64_t Uint128High64(uint128 v) { return v.hi_; } #if defined(ABSL_IS_LITTLE_ENDIAN) constexpr uint128::uint128(uint64_t high, uint64_t low) - : lo_(low), hi_(high) {} + : lo_{low}, hi_{high} {} constexpr uint128::uint128(int v) - : lo_(v), hi_(v < 0 ? std::numeric_limits::max() : 0) {} + : lo_{static_cast(v)}, + hi_{v < 0 ? std::numeric_limits::max() : 0} {} constexpr uint128::uint128(long v) // NOLINT(runtime/int) - : lo_(v), hi_(v < 0 ? std::numeric_limits::max() : 0) {} + : lo_{static_cast(v)}, + hi_{v < 0 ? std::numeric_limits::max() : 0} {} constexpr uint128::uint128(long long v) // NOLINT(runtime/int) - : lo_(v), hi_(v < 0 ? std::numeric_limits::max() : 0) {} + : lo_{static_cast(v)}, + hi_{v < 0 ? std::numeric_limits::max() : 0} {} -constexpr uint128::uint128(unsigned int v) : lo_(v), hi_(0) {} +constexpr uint128::uint128(unsigned int v) : lo_{v}, hi_{0} {} // NOLINTNEXTLINE(runtime/int) -constexpr uint128::uint128(unsigned long v) : lo_(v), hi_(0) {} +constexpr uint128::uint128(unsigned long v) : lo_{v}, hi_{0} {} // NOLINTNEXTLINE(runtime/int) -constexpr uint128::uint128(unsigned long long v) : lo_(v), hi_(0) {} +constexpr uint128::uint128(unsigned long long v) : lo_{v}, hi_{0} {} #ifdef ABSL_HAVE_INTRINSIC_INT128 constexpr uint128::uint128(__int128 v) - : lo_(static_cast(v & ~uint64_t{0})), - hi_(static_cast(static_cast(v) >> 64)) {} + : lo_{static_cast(v & ~uint64_t{0})}, + hi_{static_cast(static_cast(v) >> 64)} {} constexpr uint128::uint128(unsigned __int128 v) - : lo_(static_cast(v & ~uint64_t{0})), - hi_(static_cast(v >> 64)) {} + : lo_{static_cast(v & ~uint64_t{0})}, + hi_{static_cast(v >> 64)} {} #endif // ABSL_HAVE_INTRINSIC_INT128 #elif defined(ABSL_IS_BIG_ENDIAN) constexpr uint128::uint128(uint64_t high, uint64_t low) - : hi_(high), lo_(low) {} + : hi_{high}, lo_{low} {} constexpr uint128::uint128(int v) - : hi_(v < 0 ? std::numeric_limits::max() : 0), lo_(v) {} + : hi_{v < 0 ? std::numeric_limits::max() : 0}, + lo_{static_cast(v)} {} constexpr uint128::uint128(long v) // NOLINT(runtime/int) - : hi_(v < 0 ? std::numeric_limits::max() : 0), lo_(v) {} + : hi_{v < 0 ? std::numeric_limits::max() : 0}, + lo_{static_cast(v)} {} constexpr uint128::uint128(long long v) // NOLINT(runtime/int) - : hi_(v < 0 ? std::numeric_limits::max() : 0), lo_(v) {} + : hi_{v < 0 ? std::numeric_limits::max() : 0}, + lo_{static_cast(v)} {} -constexpr uint128::uint128(unsigned int v) : hi_(0), lo_(v) {} +constexpr uint128::uint128(unsigned int v) : hi_{0}, lo_{v} {} // NOLINTNEXTLINE(runtime/int) -constexpr uint128::uint128(unsigned long v) : hi_(0), lo_(v) {} +constexpr uint128::uint128(unsigned long v) : hi_{0}, lo_{v} {} // NOLINTNEXTLINE(runtime/int) -constexpr uint128::uint128(unsigned long long v) : hi_(0), lo_(v) {} +constexpr uint128::uint128(unsigned long long v) : hi_{0}, lo_{v} {} #ifdef ABSL_HAVE_INTRINSIC_INT128 constexpr uint128::uint128(__int128 v) - : hi_(static_cast(static_cast(v) >> 64)), - lo_(static_cast(v & ~uint64_t{0})) {} + : hi_{static_cast(static_cast(v) >> 64)}, + lo_{static_cast(v & ~uint64_t{0})} {} constexpr uint128::uint128(unsigned __int128 v) - : hi_(static_cast(v >> 64)), - lo_(static_cast(v & ~uint64_t{0})) {} + : hi_{static_cast(v >> 64)}, + lo_{static_cast(v & ~uint64_t{0})} {} #endif // ABSL_HAVE_INTRINSIC_INT128 #else // byte order -- cgit v1.2.3