From nobody Sat May 14 11:50:17 2022 X-Original-To: dev-commits-src-main@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 489FD1ACCF47; Sat, 14 May 2022 11:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L0kNB18hPz3rwm; Sat, 14 May 2022 11:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529019; 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=hFPzWqb5WBAkGU7qR5BfSXIGbkXnm4IPypgrRJHD+AY=; b=TM7ZsRoW6c519eUjNpZX7rzr0c3PMGSB71es1s8uSRfk2X5AbDigyCVoN8z/4+7xLaf8oi R56nBiljRJBah0VR0rTf9IXGYM/oz+W4IqxPrOyOohkE2IP6neEBTtjXCBkR3iGdCxjXh3 dGSvkf0R+m3ZNGQhmvIgAvsaMZCC1GtFYYqHRy683oLRqz274gjigjFPkUW+On3fcuLKiH K35dB99XRiDKfEE4ZuXUYesydEbIZNVOeXQkiXcBosJ3NEmbj8VGZqUJbXJcDGZ5SNoBEk r3E139NjlWG+iZzUzsSFa1a7FFWPe+DoPmm/xITHI8Kg6xrhXHQIyKV1R+DR4Q== 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 E85D01686C; Sat, 14 May 2022 11:50:17 +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 24EBoHmC022509; Sat, 14 May 2022 11:50:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24EBoHTR022503; Sat, 14 May 2022 11:50:17 GMT (envelope-from git) Date: Sat, 14 May 2022 11:50:17 GMT Message-Id: <202205141150.24EBoHTR022503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 53683b95ef66 - main - Apply libc++ fix for not compiling at all List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 53683b95ef66a12337999587cd98302b1b425920 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652529019; 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=hFPzWqb5WBAkGU7qR5BfSXIGbkXnm4IPypgrRJHD+AY=; b=BtLGlgLRGMLKzUSNfWMG5867AwYZGS5Oq/rZLqVcou748ies7A18R/3INaZbGkGNj4AWgH JnKoJwiBO58WJF4mO9l6zPUlyjKaYkxFklfcmxyi95oAirCHX5T0i1nkHZHMNrKuQe9OxZ zdBfYQXd4yAHEd1TWqIZtgNEXyIj1sQ3owYRzT0/nBxa5zu8B4lyvYCXuGUtQPaIVFFRAT lPKZvb38jRjZYwqZacEWKFOyvjdAX1iZkxuabKMZuw4JNpV7nb8kEIdnUGQvmIoiPyD/WI YOGBRQ4YJKzuxjWKAl63pQVN4KxCFB/gysIj52Vng7Loz1MBZH4FeDGTnYIycw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652529019; a=rsa-sha256; cv=none; b=qH5YjUopzZDxe62rlXCpw1Vd5q3quRu84H7QrcZ+Avd5tikoG4beakeCQI+GktvNNi5d0O BMXgHrga0O1T53UwpRZcCtzeWpgqGlQFuzYOPnLpqFBZp63L4UDr5BeM9QHy/vR8xy5fZw nSb5j8firToFvRwK+RViZF8wIZmz54h6ES1bEzKQXvKGe23jY6Bo0Io/6CFozPHEa5kKId QhlNUMHkb/NwmNphr7pKxQUiQKnhfFBUXFXcprtxxPvMB8cmgZ8oRZflOGiBg9tOLcFMPI DTTWIC91BAyxPBGCtbUQEaYPL4VYI+dDweFOvrsi5r7M1nygFdvrb8uOxy7s1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=53683b95ef66a12337999587cd98302b1b425920 commit 53683b95ef66a12337999587cd98302b1b425920 Author: Dimitry Andric AuthorDate: 2022-04-07 20:04:53 +0000 Commit: Dimitry Andric CommitDate: 2022-05-14 11:46:39 +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 --- .../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 5f4db2fd595c..e5bf55e37804 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -670,6 +670,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