From patchwork Thu Jan 11 09:40:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 187271 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1333400dyi; Thu, 11 Jan 2024 01:42:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlsyw8iSkEbWSLgXk4gYqZBMOfxyRVJgYvjNYiQBLN4s0mUj6K2f94Uq5KpfBZfDsIvvHW X-Received: by 2002:a05:6214:234c:b0:67e:dbb1:793e with SMTP id hu12-20020a056214234c00b0067edbb1793emr1074555qvb.41.1704966178719; Thu, 11 Jan 2024 01:42:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704966178; cv=pass; d=google.com; s=arc-20160816; b=tzQFXuBuF2rK5cPprYzPFdrih5hZGX/HASIOi80vJcGndQLZun40Ff1RR2sh9EqCpP DAYCViYjCkqvQRusEoI5A8VKYAdVPfLJX2d/oehCN5709hUb0LlPwcT2EmQUqyDLCqi3 TV6EZzHTpIq1ecxgpq/O9fI3+n+AqsRuGjNVNXDbaIlQpjb3MDxC8EtROi5DITDrD0pw ZUasLw6dpjuu5sPUMLzTqNDUf0PmmliiQqowyvwudQekX9oWZdYU6p8hCLG3i4YBhCoH MNVxgpU73Mxx8Y2FFQ8IDATomLrEMFqWc63EN1kuNlHvhYL+eN6ixGVzIoCBVfx1Wvwe 0cCQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=mdaViwuvpXTIW46quw08cXeO19LjoiG7FcZLpxTH6y4=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=bwvBqND32fL+NtvETIeJIhO+6iPOQcFLZXY0qTt5AKolYmRQoIitMgwOPX+9sfoYHZ Ws0nllC1NxIJRcjmtRkR7YgVKIegqhmDHf5bgHY0N5BJSaMzjzMTkg4vDKNUqhDZjwqI Tz01MDq2Uq9BVNcwK6dceqxIg1KmUi3DP3JPt1kXWERTe/7z409odUhJNXxhZSzHqyYf oZLqHeF//BHoupCaRool7WTVu+msKp8b6UCDi1v7jAtPAFlkKiz0bKZPllmRxjLIpNws hsehaaONsUrhnm58oip+qWo1BTsMFIYwklHkl2Vr7RhlKUV07QP9UdHT27TINMJTvQ3h xStA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=K3P9PBk6; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id x9-20020a0cc509000000b0067abb363a4bsi457377qvi.231.2024.01.11.01.42.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 01:42:58 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=K3P9PBk6; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DADF385DC15 for ; Thu, 11 Jan 2024 09:42:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DADF385DC15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704966178; bh=mdaViwuvpXTIW46quw08cXeO19LjoiG7FcZLpxTH6y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=K3P9PBk6fNxttQ0hVHik2f/9i8FsbPSnpFPGf8KQKqEjwj032RkBv8dDxYDJ/EYO2 sIsW+7aXypz71IlGzWPjGx7sDZ/sHOD/ad79Fv6SQGgstZsQ/RpPD2KqlNBEcbuD2r Iqig/2d9tXjnNwU69dZFU7QEvv0o4J1Bja8tTcag= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id 68E943857BAC; Thu, 11 Jan 2024 09:41:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68E943857BAC Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 68E943857BAC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966079; cv=none; b=YVE1MwdkMyXojFtKN0d3oHbd3DorzvkUGU52sWuK34a/wrcOEI+pAQ67Y6+DnB3+Gw0U2OLKsB+f+qwJr3CGMgpVYHvLdk0WeYfPy5/xumTH0rS301JTiS3Dh7VslCtpTtRj/UbxlQox9GnJuE2jJTkrhOwLycjAZc29xLLHli8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966079; c=relaxed/simple; bh=O8WUgy57eOSk/p9oqL3Hu844xadvMd75eC0DwvH7IdI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=rMPRoOr7JjryGDcMjZg6IwzWHkGqQ4+5eqx8Gq5j4xUcMXLxP/fns4XzhaXPQgMonOBYFDw7dPbpCVnqHfdc/leEly2RnhIxjxTgsGAfBvxKC3bY7K7JkTyCsPdWS3/5Dyv1vtmuN5uo0dBGcu+odIgRzyEMyvXn0bs3zd1WBpk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247475.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40B9UboO028318; Thu, 11 Jan 2024 09:41:13 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vj56y27p7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Jan 2024 09:41:13 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout23.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 40B9enU6032500 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jan 2024 01:40:49 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.143]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 40B9emYd015296 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Jan 2024 01:40:48 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v2 1/2] libstdc++: Fix error handling in filesystem::equivalent [PR113250] Date: Thu, 11 Jan 2024 01:40:37 -0800 Message-ID: <20240111094038.876653-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111062222.525186-1-kmatsui@gcc.gnu.org> References: <20240111062222.525186-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: 0tJXjpodAqiFDx4a_pUH2eqEaXTZzoSY X-Proofpoint-ORIG-GUID: 0tJXjpodAqiFDx4a_pUH2eqEaXTZzoSY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-11_04,2024-01-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=967 clxscore=1034 lowpriorityscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401110077 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787786615413922774 X-GMAIL-MSGID: 1787786615413922774 This patch made std::filesystem::equivalent correctly throw an exception when either path does not exist as per [fs.op.equivalent]/4. libstdc++-v3/ChangeLog: * src/c++17/fs_ops.cc (fs::equivalent): Use || instead of &&. * src/filesystem/ops.cc (fs::equivalent): Likewise. * testsuite/27_io/filesystem/operations/equivalent.cc: Handle error codes. * testsuite/experimental/filesystem/operations/equivalent.cc: Likewise. Signed-off-by: Ken Matsui --- libstdc++-v3/src/c++17/fs_ops.cc | 2 +- libstdc++-v3/src/filesystem/ops.cc | 2 +- .../testsuite/27_io/filesystem/operations/equivalent.cc | 4 ++-- .../experimental/filesystem/operations/equivalent.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index e0b308a37ea..61df19753ef 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -897,7 +897,7 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept return st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino; #endif } - else if (!exists(s1) && !exists(s2)) + else if (!exists(s1) || !exists(s2)) ec = std::make_error_code(std::errc::no_such_file_or_directory); else if (err) ec.assign(err, std::generic_category()); diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index eccdae3d910..4d23a804da0 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -765,7 +765,7 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept return false; return st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino; } - else if (!exists(s1) && !exists(s2)) + else if (!exists(s1) || !exists(s2)) ec = std::make_error_code(std::errc::no_such_file_or_directory); else if (err) ec.assign(err, std::generic_category()); diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc index 78f6e368204..68f32366d65 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/equivalent.cc @@ -34,13 +34,13 @@ test01() bool result; result = equivalent(p1, p2, ec); - VERIFY( ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); __gnu_test::scoped_file f1(p1); ec = bad_ec; result = equivalent(p1, p2, ec); - VERIFY( !ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); __gnu_test::scoped_file f2(p2); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc b/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc index 929a6ca8609..5bc477a31cd 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/operations/equivalent.cc @@ -35,13 +35,13 @@ test01() bool result; result = equivalent(p1, p2, ec); - VERIFY( ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); const auto bad_ec = ec; __gnu_test::scoped_file f1(p1); result = equivalent(p1, p2, ec); - VERIFY( !ec ); + VERIFY( ec == std::errc::no_such_file_or_directory ); VERIFY( !result ); __gnu_test::scoped_file f2(p2); From patchwork Thu Jan 11 09:40:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 187272 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1333785dyi; Thu, 11 Jan 2024 01:43:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFIXQMXYiJT+E8q/S+kCi4WdyOObiWAKHY21I9fLMIJK85u1mk/vVfmz7MChc5Zt820cLCy X-Received: by 2002:ad4:5f0e:0:b0:681:23d6:9008 with SMTP id fo14-20020ad45f0e000000b0068123d69008mr962564qvb.50.1704966239265; Thu, 11 Jan 2024 01:43:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704966239; cv=pass; d=google.com; s=arc-20160816; b=ncG1G3NWJRfv1fscDanlSLrNJsiEiBMpYSNOX8NyLWbyvmyszvq4i/k4LyjLxihypH CebGUE+idR7ZWSQA5AquQNbzJ3RJ5+WEgynJUCH8rd7luVwlI/bLVgg+ST2jfFq+ZJ8r StYZiwuvHROxd/OJjdn17ECGJviI99B/P+kjtmZpuzGe53s9WdWMYXwGDqK5pUlhKUrk H6IJsTnYhz+QlgVG0f8jgs6D2+grLzXfGh7H5gIuvCdiBAFF+StqXPGu8VKKJjWS0krj dQU2H2PXQ9fV8E09NJPjgI9iALYY1HfIoTogiWFKf0kMgXUPBKNpi6KLrHboXjr2YPfj U7iQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=o8MTcRNhGySLUcbJf7UMVnN/QpFOkGrEC2aKu7Vrqv8=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=xzbBHek3rZ4AgVUx9EgvIknFuraUG+jZTLoWj8vCNoZjcKZQb7FN8LTMgwN3C4YOO2 7HOH9nBoCmMWy0687J5n9yMiJQzZrimB+N/fyEOAfOFU7JENbNpfnUKtADsirBxqTtp+ YKxyOfrF4GTD9drWXSMRUoZWP7E6K0xAHx56ZFNCRfWMz2Np04Xbv8q4f3E7bL7zowi9 oXtMFAwtMN6/jJnQ9V5qsUe58P9udiuFVEd3H3qPnNpO7/7VUuVZoTYGlO6sfdonhROI vxUGAieRl4OsDIUMrOCR54alBKh8xr3sSnJQEUt29k2T5KnWrJDJPvmxhncTqTN/cvvm X/2w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=NcQE2GhB; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id g4-20020a0cdf04000000b0067f9b223bfesi435892qvl.379.2024.01.11.01.43.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jan 2024 01:43:59 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=NcQE2GhB; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C48DE385770D for ; Thu, 11 Jan 2024 09:43:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C48DE385770D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704966238; bh=o8MTcRNhGySLUcbJf7UMVnN/QpFOkGrEC2aKu7Vrqv8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NcQE2GhBd+N8zerm7VLRcoRTAbxch6y//6c9DYrX59/jVGUkrLj6JNkXIQWxQLnI+ abnA86pyP/yl+NT38p9QBZYP1j1SLmusiEgysunu2XV74UoHDOTwE+WkQXle7RzM7R qdgT0AIhSRqUijaK14KEvpdlbskbdUHY26lwuY3g= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id 4D0383857B87; Thu, 11 Jan 2024 09:41:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D0383857B87 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4D0383857B87 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966079; cv=none; b=wZhInX9d+EhLKRt5VwIiFKax12z/5nOwRS0wBmVLhKAxHW4FXtwr9PeXIAmmu93/kxT1S0wpQi3c28REuz0d8/nffxoq6xvJrVivi4lWUDzHpp1rOal4CWsvpQ3qs1aSfzzoXheQrKJPyH5vc5f01SikT8yjxXp5Q5snzT3hZg0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704966079; c=relaxed/simple; bh=gl2oifG5b2tBTEFjUX7WjLTNOBsR9p2BWBnrSGXNAQo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=P64ZsJfa02eVxU29d/hhzNNS1LXhhcQX46NwMY5XSZNzAao5Q9VUFUk4b+5ZwYIrqaPTw5aV5C3BOFC/u0Ux9tCDqkcQC7ILg0lsQDW1RUENhiXCTOSzFfkZKLI7u+cXkUb0pRpeO2fx6nxSmrPpw/c8H8g6F9XseFCrSVmlFb8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247473.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40B9dWRM022568; Thu, 11 Jan 2024 09:41:14 GMT Received: from mxout25.s.uw.edu (mxout25.s.uw.edu [140.142.234.175]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vj1tumk1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Jan 2024 09:41:14 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout25.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 40B9erdj003070 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jan 2024 01:40:53 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.143]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 40B9emYe015296 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 11 Jan 2024 01:40:53 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v2 2/2] libstdc++: Use using instead of typedef in opts-common.h Date: Thu, 11 Jan 2024 01:40:38 -0800 Message-ID: <20240111094038.876653-2-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240111094038.876653-1-kmatsui@gcc.gnu.org> References: <20240111062222.525186-1-kmatsui@gcc.gnu.org> <20240111094038.876653-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: lNYk5-2azgoOfVgl40fP2buU8kbAgDYj X-Proofpoint-GUID: lNYk5-2azgoOfVgl40fP2buU8kbAgDYj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-11_04,2024-01-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 phishscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 clxscore=1034 suspectscore=0 impostorscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401110077 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787786679583700405 X-GMAIL-MSGID: 1787786679583700405 libstdc++-v3/ChangeLog: * src/filesystem/ops-common.h (stat_type): Use using. Signed-off-by: Ken Matsui --- libstdc++-v3/src/filesystem/ops-common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index d78a54754c2..e302d8caae6 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -118,7 +118,7 @@ namespace __gnu_posix inline int close(int fd) { return ::_close(fd); } - typedef struct ::__stat64 stat_type; + using stat_type = struct ::_stat64; inline int stat(const wchar_t* path, stat_type* buffer) { return ::_wstat64(path, buffer); } @@ -184,7 +184,7 @@ namespace __gnu_posix using ::open; using ::close; # ifdef _GLIBCXX_HAVE_SYS_STAT_H - typedef struct ::stat stat_type; + using stat_type = struct ::stat; using ::stat; # ifdef _GLIBCXX_USE_LSTAT using ::lstat;