From nobody Sat Jun 04 12:01:21 2022 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 CF09B1B56A45; Sat, 4 Jun 2022 12:01:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFddG07V7z4cSb; Sat, 4 Jun 2022 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344082; 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=Y452iBjOVGYkGvxhitZWXB0CzSGfm7ShyolZinfvEBg=; b=l8D4YpO6LdDNbpnD7w14qdU6tVNWnOj6aCpiafMArK+oQ9+Nd73TnUxSSxt59FwqTnniAv 6WdASrzKZuq14BGRzQ1Wv6XJgDOGw1YTVnoPHCd2jUBDi5vT8Tnw02jAcdTWw/ESpOaWFb TRwObzkgssM5/rtXccyRRAaRV+zoKBy3p5/dNcUbA4RdgqH9troY7W6a/LUyECHZ5Fl1Ss g3AZImXbnZ6UXCQ/ivV5T3tGZm+a/a4zdvtpLPG4XflbH0UULdjC/Vbu8w8rSFTcoNLUnk 9VTK2o1J0iCeAdVpwax7Uvu+SKqlJMwHpjDt/QSGX4tDzacTOaTd1XM7mQ5baw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 75A4D1D4CA; Sat, 4 Jun 2022 12:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 254C1LXC093858; Sat, 4 Jun 2022 12:01:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1L0h093857; Sat, 4 Jun 2022 12:01:21 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:21 GMT Message-Id: <202206041201.254C1L0h093857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d3978dca08ee - stable/13 - Apply libc++ fix for not compiling at all 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: d3978dca08ee3d50ec8b01dfe90d388e0499bded Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344082; 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=Y452iBjOVGYkGvxhitZWXB0CzSGfm7ShyolZinfvEBg=; b=IznyRLGTYmQyl38er5PidUwFLpdN7tZYDSN8Drw4mKhkyAVByz2lqIEzollA9/gb8WTYUh MUhcRJXfQSRAxHFg7RqPv2Y2/rSurd33P7HaI0OyAmqIign4clXLmhws76arjsbKk3+Pc2 lFWyLiEPBhYLlJ9ag4R3Y60eHExne16T5dLcOqLLn9Qh8/rE9ioS057ks9SbNl8Wmj+g+0 xEdjFBdzLKX/lPC5mDhqHW2X6VKFp8IreCL/afmtXU60jcvLAqtDbEulQV3YdgW1ARfgKS Zjwc3+7QM4JAo0RZ6Hp4m/+8Aw4NPngM9f+2iex4WqkVWOB+49y3vuj0KmCuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344082; a=rsa-sha256; cv=none; b=ZNAPo8UP+5aR3ynCQAEU0kLSTllPJhy/junanLfsRzD2T/6dRAceCTLlk8bnxDr5bPUg0u Qw05Or3kToRNJJUt7Q4ZYTnCtp6u2gVCvZYhGLmglyVrVTtxe8SyowblZkdxcBMroQMywl s1Y7OQ7Dk/GmmQvrzOCFe1OtmpTnooi6vG6kSMxKsGiXxLnRFItLPBKBgodSb8wwFVQBpy IWTkt8NYYRROsuS8lZbr2nsf3Iqq3Hnyqz+cl4ssKEMXfCzQ14FqPVSlm/RFeac+dM6jJI vkK30QP1xoxusKdLFS4WzPHb/cSj7xublx6gKjUbli9QGxS2srKFRbCMDgrvXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d3978dca08ee3d50ec8b01dfe90d388e0499bded commit d3978dca08ee3d50ec8b01dfe90d388e0499bded Author: Dimitry Andric AuthorDate: 2022-04-07 20:04:53 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 12:00:04 +0000 Apply libc++ fix for not compiling at all Merge commit 44cdca37c01a from llvm git (by Arthur O'Dwyer): [libc++] Define `namespace views` in its own detail header. Discovered in the comments on D118748: we would like this namespace to exist anytime Ranges exists, regardless of whether concepts syntax is supported. Also, we'd like to fully granularize the header, which means not putting any loose declarations at the top level. Differential Revision: https://reviews.llvm.org/D118809 (cherry picked from commit 53683b95ef66a12337999587cd98302b1b425920) --- .../llvm-project/libcxx/include/__ranges/views.h | 35 ++++++++++++++++++++++ .../llvm-project/libcxx/include/module.modulemap | 1 + contrib/llvm-project/libcxx/include/ranges | 11 +------ lib/libc++/Makefile | 1 + 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__ranges/views.h b/contrib/llvm-project/libcxx/include/__ranges/views.h new file mode 100644 index 000000000000..8cc5ba3d2aca --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__ranges/views.h @@ -0,0 +1,35 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef _LIBCPP___RANGES_VIEWS +#define _LIBCPP___RANGES_VIEWS + +#include <__config> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) + +namespace ranges { + +namespace views { } + +} // namespace ranges + +namespace views = ranges::views; + +#endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___RANGES_VIEWS diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index 749c17f8bc08..9e3643faee09 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -817,6 +817,7 @@ module std [system] { export functional.__functional.perfect_forward } module view_interface { private header "__ranges/view_interface.h" } + module views { private header "__ranges/views.h" } } } module ratio { diff --git a/contrib/llvm-project/libcxx/include/ranges b/contrib/llvm-project/libcxx/include/ranges index 82ad7f4d507f..9b831160d683 100644 --- a/contrib/llvm-project/libcxx/include/ranges +++ b/contrib/llvm-project/libcxx/include/ranges @@ -223,6 +223,7 @@ namespace std::ranges { #include <__ranges/take_view.h> #include <__ranges/transform_view.h> #include <__ranges/view_interface.h> +#include <__ranges/views.h> #include // Required by the standard. #include // Required by the standard. #include // Required by the standard. @@ -233,14 +234,4 @@ namespace std::ranges { #pragma GCC system_header #endif -#if !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) - -_LIBCPP_BEGIN_NAMESPACE_STD - -namespace views = ranges::views; - -_LIBCPP_END_NAMESPACE_STD - -#endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) - #endif // _LIBCPP_RANGES diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index a5ed5c9d9dac..44d94025001e 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -668,6 +668,7 @@ RNG_HEADERS+= subrange.h RNG_HEADERS+= take_view.h RNG_HEADERS+= transform_view.h RNG_HEADERS+= view_interface.h +RNG_HEADERS+= views.h .for hdr in ${RNG_HEADERS} RNG+= ${HDRDIR}/__ranges/${hdr} .endfor