From nobody Fri May 29 23:02:05 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 4gRzQ608Nyz6gF6W for ; Fri, 29 May 2026 23:02:06 +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 4gRzQ557Ccz3CHN for ; Fri, 29 May 2026 23:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095725; 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=L+Wx+TTWSvKbc5NkeAmhomraNAlzNLXFbhOyzpYXVJM=; b=Mc3SU4lWMUjwEJa2Uvu2GFo0Ymym1LWdyoo1A+mFtEhWPOkUZZr/aNvmC2Joa89EibHIH/ oAtcwkKzmK9nVLJYLinmJfEzgWOXN96bS2N0hTxSxi7XTa5XqWkmSin72lg+Lof/ZeKzxC pUrGvdSuNs7NmOXGWL36A/1bdF0QCfZc7rpWTeKZKwbIXYl0KTZoH0F6YRXU8QegWFnBWs QYVggmjitEvu8T2H186TlASl4OKOxbNS4VowE3GdWYZlQgh2goB2ylXo+MtFPfWUkXYDJK GSG6XkMdDXkFYi0CzT/iAUYl1AaYmAo74idK5u67Xb5ryrPjysq0RmYz0+0kCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095725; a=rsa-sha256; cv=none; b=ZILgPMAYWmUFhe0IuVfak1iPCyDQl1pd8L46wAjQQ4oagFkRlzP87Q/PplCzH0JVxRwkpb wokeQiBDg+XUYQs0RqMJULSEO4+NizjZcRcMdf4QVKKj+hOiYWjglWL/ZYpx6Z0/5jzpYV EjaQ/6ZYtMdYwSSZVypP1Mk1HLHoaUmpTF9VzefDR5mB8JrRUfuIl3PlI1lRmGBQ9W1Ije ZlbZGSZjVuA+wExQxak4HybIvdAYTgWLCEozJklwR2DS962bIxFEkh4whMzvwPzrNmT2yg z3QHd/2bcR/cDxBGyO7dFNcC6whtpKpJUY+gR+D+bCu6voFVj1QNIA4WzAQQjw== 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=1780095725; 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=L+Wx+TTWSvKbc5NkeAmhomraNAlzNLXFbhOyzpYXVJM=; b=ZHWO4Z0QbpAr5P7A5rNfTp9oph4kHzXD7Eb2fa67xCezD365qeYxb+9A7GsvzoMKsCebak bIsqZdAYFfcTo3uzw2MFi2Th6TuBI7Ztam2ZO4vpxxbWHlF0qNKGxqRI5N9hwad31RhLzx dM6YQc7GzyxtvWrKi7RGPYTZfgeCzPhhJtFi10MjG0kLpJzWL/wox16p/nOUlsw1OMt+Sk uEsNdbwe4wS5OHUXFHq60Vp44KV+QaVdb3PnM3k31cGBBHaDe/sj4bT6ngbuRmAl26iPhG z2ed6UIeAGhcfy8CCXjcqUbaGEK1ToaOOuJNCiVvRSeaJC61IrfIVpjukq00zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzQ54Zdtztdd for ; Fri, 29 May 2026 23:02:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4239f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:02:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 7210aadecc98 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 7210aadecc9872675641be32310d10dac7b0fefc Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:02:05 +0000 Message-Id: <6a1a1aed.4239f.301cbd21@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7210aadecc9872675641be32310d10dac7b0fefc commit 7210aadecc9872675641be32310d10dac7b0fefc Author: Dimitry Andric AuthorDate: 2026-02-14 23:19:40 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:32 +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);