Author: Louis Dionne Date: 2024-06-15T10:21:32-07:00 New Revision: 72c9425a79fda8e9001fcde091e8703f9fb2a43a
URL: https://github.com/llvm/llvm-project/commit/72c9425a79fda8e9001fcde091e8703f9fb2a43a DIFF: https://github.com/llvm/llvm-project/commit/72c9425a79fda8e9001fcde091e8703f9fb2a43a.diff LOG: [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) Added: Modified: libcxx/include/string Removed: ################################################################################ diff --git a/libcxx/include/string b/libcxx/include/string index ba169c3dbfc9e..618ceb71b26b4 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -1943,8 +1943,8 @@ private: if (__s < __min_cap) { return static_cast<size_type>(__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; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
