From 69e63d3288325c6e599e630b655ea228881bc042 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 24 Jan 2024 09:28:58 -0500 Subject: [PATCH] [libc++][NFC] Rewrite function call on two lines for clarity (#79141) Previously, there was a ternary conditional with a less-than comparison appearing inside a template argument, which was really confusing because of the <...> of the function template. This patch rewrites the same statement on two lines for clarity. (cherry picked from commit 382f70a877f00ab71f3cb5ba461b52e1b59cd292) --- libcxx/include/string | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/include/string b/libcxx/include/string index ba169c3dbfc9e6..618ceb71b26b48 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -1943,8 +1943,8 @@ private: if (__s < __min_cap) { return static_cast(__min_cap) - 1; } - size_type __guess = - __align_it < sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : 1 > (__s + 1) - 1; + const size_type __boundary = sizeof(value_type) < __alignment ? __alignment / sizeof(value_type) : 1; + size_type __guess = __align_it<__boundary>(__s + 1) - 1; if (__guess == __min_cap) ++__guess; return __guess;