From nobody Sat Apr 25 14:20:19 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 4g2sRl47xZz6bZdh for ; Sat, 25 Apr 2026 14:20:19 +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 4g2sRl0yqsz3JF7 for ; Sat, 25 Apr 2026 14:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126819; 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=E7U4C+nOcBX3qdxl89II28mABHwya3jkTeAM+5bQ2Wc=; b=VOcqKug/Qa1UyZGGS54+kKEbJODkk/XLcMt3xM5q4TOvjxnGycF5eGKEs3sf3JdG3odjSF 0g896tMut5JoAnnQo6YClJqQ39vweRHMxfDoncS+XJ4Nhi4FA6Osz6Y51aKdnEX28ZrBNO gHNmMYdDPRbupM0q3o8mme+DgIRLb4a0jJe+1Fo5b92ntPMy1PPTDNgwptEjlgc3TgEX8b 1Z+9h94EjZsdPiNWuuGGSkYU8hi4ht4ujCotHoX2RIHUBCDHqx0wLWUOEB3kTkCl+Ts2hQ Rz85pJjGG9NQgrGshOsDziNQK3T/zL7n0xsrfXB0lfT15WAwat7YzR+KaPLkYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126819; a=rsa-sha256; cv=none; b=cat/jjLWkUS+rwAhx4qPI2bQzpFmDoLWtnOSAhfn3EncvvxYk+dsoWHdc3TZks91KzULE5 84km/gv50lyn4KDdRrETUniNzfX0WQw+1c3MsnPIQLuO4ADygYtw85EH1rLnGl/7fqWBW2 Ees8WOEC9+lmSjYX1VRNaBQUzvl2eMDgZDmebkR4o0rQf7dSat2CfGdsiCCoUj4iz+YgtL QwFMh4s/pnYzUvSVHU4wVPY9TC33B3MXnbLFVSWyGOe9E0B8GB+lWUQcCrIq3yCccaYYRO WDwm2GDWW1SHNXIIwHdeEYqAw9EBWn7tKXRKn2TC90QUPZcGs/YbNmytbRaecw== 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=1777126819; 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=E7U4C+nOcBX3qdxl89II28mABHwya3jkTeAM+5bQ2Wc=; b=Vdcax5XVU5RebUlXquaE8YpVD8YPa8ZNwizLcpxOEbn5iyS9uqibf7vBtTa2wuuJRNeLov Y7waZpeVYO558d5P2y2W4cBbRg2F5CRFfvk4LX2DxsJhilJ35HTbUzxrojDyP+Z0Qim1OJ uSu2OsE/AtGr1799Cp3AIs+mNF2bkSCph0z6KrtPu45dC3en0tFFXk7H486CfVxvOkwQ3r zsogv+zd5sJ/3GiKkSfbKbjdEILCzDjeERCcqz7dac8JFcdFo8m+Lr9TYA8H6/iVzTvatI k1Xyr+fQXsgHSDbRzOrd+NvoiaPGAL7ZjWcQjT4GaaxS9Z2i8uY2Tbbv7P+NHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRl08X4zdG4 for ; Sat, 25 Apr 2026 14:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37acc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 0f15398d123a - main - 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 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/main X-Git-Reftype: branch X-Git-Commit: 0f15398d123a9cf02711efddf5e4040f0066c6de Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:19 +0000 Message-Id: <69eccda3.37acc.5d03cb47@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0f15398d123a9cf02711efddf5e4040f0066c6de commit 0f15398d123a9cf02711efddf5e4040f0066c6de Author: Dimitry Andric AuthorDate: 2026-02-14 23:19:40 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:22 +0000 Fixup mismerge in __cxx03/__type_traits/add_[lr]value_reference.h. PR: 292067 MFC after: 1 month --- .../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);