From nobody Wed Oct 23 18:30:35 2024 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 4XYczw20Pkz5ZWtV; Wed, 23 Oct 2024 18:30:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczw0Rg1z59HW; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; 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=YKPsBawOPjAl1hpEGb4iiQprQvFZNGGyCKioVSsaOJo=; b=oeeP7/aeRd8HKNLI1m+uSOXGYfxnczKoDDK7yV8Z8hWKcuo4sbhrujosnWTLlPOfXRi2J0 aMQNYk6vxUT/s+ycID0C3Hv/7+dHm9B9eahvx5zSTC1WCrSvQ9nVfoAQOyTA1YJAKku+zq GcFwOMAHlULYBxhBTse7nbzwYdPomx+CV6coB2tOtvro/vrlVX49+AGW+v3grvsx/I1Ciu gF5P4BfktIZ3j0T5N7rw6spOkDJmvzorJ3SR4dTKu5tFRLGPYQJGPEkrh2hyjJljyfe7lP yrquYVpA+6y5toCo4vxoO4E3iShmpdoHP8tamT7QwlFYbfCxJWAHr24/QDBeuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; 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=YKPsBawOPjAl1hpEGb4iiQprQvFZNGGyCKioVSsaOJo=; b=IuFsbKfQbkYPssRhmTGHTMJI4CJMVJf3QAzPxD0AJIrYPh4eaYSEd3ftQrulwRrKWl9rA/ RUojFN63LvZwg5bJMaME0SILSqgeG6nZ68Cacz+mnIh9TCEaQTTOZuaXoeQxkaQ6NDHAPL oBrCZbNAeeaxctVG4yKjxrfhrqFwsiyoMH5rNGne64ogcx4DI6cA1r1r8OsyigrWhZtben ZOUVeV6Q+QVy/Zi5JsbCioiWWsVv1GL6kJ8IwXx5ue7Wk9mm6QWkNKQtbqtPnHaKgjt+8N FC5MDtNzzt84topVzBgIq5KvzHpL2FlO4K8EVriHbKy9ltd0OjxU9p1bwiwHEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708236; a=rsa-sha256; cv=none; b=wABD9Pzn9giA1g00rush/6kgZ7eUbfAZH2qNkbkugRzEwr4RuvMPyH2Pydw7t7KZhltOu+ XoVOG9qHMiyXrmvIO1Ox1ZuXgiiaIM+DbYYWreYRRlJYgunZ6+WyvefQHRWTlUND9ECfLX jh3DYR81BozY7zBzxC5mnB2yu8p0/blCYEjgEZjU/BEgb8h3dygkW1fO9GYQF4ValTNUfT eIeSILdMfsELljkQKYt+AlfalaSVpNjiSKDS3gXw8iWwELMZmbrRTnqiu3Dhm+jsZ5O9gp iCD0gBXoqYS+WrqvkRKcz14lJMdj6PPSZ/GLQ7VPfrq7U2o1dhYj4TjcWFk1Gw== 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 4XYczv4VLkz17yN; Wed, 23 Oct 2024 18:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49NIUZbV069270; Wed, 23 Oct 2024 18:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUZnr069267; Wed, 23 Oct 2024 18:30:35 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:35 GMT Message-Id: <202410231830.49NIUZnr069267@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: 04f5b79cfa49 - main - libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: 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: 04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc commit 04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc Author: Dimitry Andric AuthorDate: 2024-08-05 20:16:04 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:40 +0000 libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: [libc++] Merge is_scoped_enum.h into is_enum.h (#99458) PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/is_enum.h | 10 ------- .../libcxx/include/__type_traits/is_scoped_enum.h | 33 ++++++++++++++++++++++ .../llvm-project/libcxx/include/module.modulemap | 1 + contrib/llvm-project/libcxx/include/type_traits | 4 +++ 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h index 2fab6db2c8d5..77ca3ea10874 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h @@ -26,16 +26,6 @@ template inline constexpr bool is_enum_v = __is_enum(_Tp); #endif -#if _LIBCPP_STD_VER >= 23 - -template -struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; - -template -inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); - -#endif // _LIBCPP_STD_VER >= 23 - _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h new file mode 100644 index 000000000000..cb3e25cf5733 --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h @@ -0,0 +1,33 @@ +//===----------------------------------------------------------------------===// +// +// 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___TYPE_TRAITS_IS_SCOPED_ENUM_H +#define _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H + +#include <__config> +#include <__type_traits/integral_constant.h> + +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif + +_LIBCPP_BEGIN_NAMESPACE_STD + +#if _LIBCPP_STD_VER >= 23 + +template +struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; + +template +inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); + +#endif // _LIBCPP_STD_VER >= 23 + +_LIBCPP_END_NAMESPACE_STD + +#endif // _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index 13d0dce34d97..d76659664f75 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -2013,6 +2013,7 @@ module std_private_type_traits_is_scalar [system header "__type_traits/is_scalar.h" export std_private_type_traits_is_null_pointer } +module std_private_type_traits_is_scoped_enum [system] { header "__type_traits/is_scoped_enum.h" } module std_private_type_traits_is_signed [system] { header "__type_traits/is_signed.h" } module std_private_type_traits_is_signed_integer [system] { header "__type_traits/is_signed_integer.h" } module std_private_type_traits_is_specialization [system] { header "__type_traits/is_specialization.h" } diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index 7f231cd09df5..ffa137338b6a 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -514,6 +514,10 @@ namespace std # include <__type_traits/unwrap_ref.h> #endif +#if _LIBCPP_STD_VER >= 23 +# include <__type_traits/is_scoped_enum.h> +#endif + #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)