From nobody Fri May 29 23:04:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gRzT729Xkz6gFwp for ; Fri, 29 May 2026 23:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRzT70HLXz3HDk for ; Fri, 29 May 2026 23:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MJ6a/IOENB+v2VW1jtv7y1q5ry3ThMKVG6iNrttpXQ=; b=kQlZe9UUMKBmKu7MFN4gfqMDK06YGKFHVHc7L1MGi6gLTeFYP8neYGMk8b3wPXSzOEuzDF HCt5F77lzkNid71YIrwo9vvvIt9Lli6Ma6DrxQfQtRbwRk9UF+lCWFqTBVjhr02vtbfLkZ LAb3u++SHB0p25G+dhxiZ4DDcadgJ3PCLCIwpgnIVQiaB6pC3HReuGPFBoKkfALG1SjAv/ zD499zi9xH2ZjREPjM8G8zKV9lRtJCCiB1cvvlPJR2rPFFOd+4TrAZdbg3mLtUZarcNKEQ ddPIk6Aoq33KJm5gvOreXqpwSG5YJr2uTiicmcgUR4bXG2TdguMntDzb6V6HKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095883; a=rsa-sha256; cv=none; b=U92p0wi9hlhXBKhA5iGDSgNytT+8NYiNCqc4n5tbblXyacreqdTIHZiIXJFuDTE7sII4JS e79P0v2gpj/8guuya1AdIfIPWqeZ9um6q9Su2hKWzjW7WHptlw1L5NFjAc1ai0KskaH7Yr oMSA7zditaYrE9gSdNkUWDHaFuybzuRTp/NgvKodnUIyO/KIMcvT3jMYrhxBW+qY0KdRvi bk/+qcewGw4kYVj+edon2mgKZ/vlUnWTheyK2HTGkrEuHxzQb0Bui09AivTEvcagrF9xIl Grk53OKdgtoUpu2LlfN4Al3NfoTiCGbHZFqbezNlBeIsyhelBAH6auOnrxrskg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MJ6a/IOENB+v2VW1jtv7y1q5ry3ThMKVG6iNrttpXQ=; b=h5iJQs2bbzLxv1R6njihrt7tGCW1wQv9KlmKkb0x1hlLCEnjSIAdIe6kxB1LHw1dY0UWZ3 ifx1t12OPevExyV+HGz+iXNV6l64LVG7aUNOauJNeD+I0+bMV8bN2WCp2JMbrTeZ1C9GaN KDT0RPbp31ClAyc0slGNsUW97f2y8MkWQ/fgxAKSqGEGbMsQB5eI/fDR+S7CCCenfe3dwn 0RqxL0foh1qe0IWSKjyAA6C0WnTKG7XrCxSk0efBQ1B84jK2o8V6KTlBvXFsO6mJSI//fh U2/cPNir8cbcjBRswhKPht5p9Uk3WO7//SjvczzXkSvCd7Xertd8htPqV0s7Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzT669XYztjM for ; Fri, 29 May 2026 23:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4276a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:04:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4a5ad04af821 - stable/14 - Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a5ad04af821659fe3f4112815f363c2cf3a0e81 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:04:42 +0000 Message-Id: <6a1a1b8a.4276a.5fee00a3@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4a5ad04af821659fe3f4112815f363c2cf3a0e81 commit 4a5ad04af821659fe3f4112815f363c2cf3a0e81 Author: Dimitry Andric AuthorDate: 2026-02-14 23:19:40 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:37 +0000 Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h. PR: 292067 MFC after: 1 month (cherry picked from commit 0f15398d123a9cf02711efddf5e4040f0066c6de) --- .../libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h | 2 +- .../libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h index c2268901b898..862224e526a5 100644 --- a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_lvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) +#if __has_builtin(__add_lvalue_reference) template using __add_lvalue_reference_t = __add_lvalue_reference(_Tp); diff --git a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h index d1be75fc837a..bc0adbf66b35 100644 --- a/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h +++ b/contrib/llvm-project/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h @@ -18,7 +18,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__add_rvalue_reference) && !defined(_LIBCPP_COMPILER_GCC) +#if __has_builtin(__add_rvalue_reference) template using __add_rvalue_reference_t = __add_rvalue_reference(_Tp);