From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2048.outbound.protection.outlook.com [40.92.75.48]) by sourceware.org (Postfix) with ESMTPS id C60F83858D28; Tue, 17 Jan 2023 21:12:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C60F83858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=hotmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hotmail.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHNLrIHER2CUOcj1Z7tKpnT3AstsOg82Al+LntWCCnp8CR8f3u09dDPPJiqS5caA/HtN34Mqv8lkIH6br3vyJWlxGg+llgmvCvtBgFKb3EfO7nQBIYENW/STntGr+1E5fhYzVIa8lid2rE4FYppWZmKbifhX+Cg7Rr3ZV/n2bDJVqzbWpKtITJLHJtMorlLKnpAgaeXDQA0wCYaNpVZNUTpFrYdSATuB2Q6wppxhqdmj6sZ2lMyXAq/89mRU5aU+j8OLpBXlLqlehM6KMy+asSh/ZO7v+G5cNl2Dtze0yzPt8wStIos4dOWU2Qu3tKf850CMg5GjobwApDMBYa3sSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=m5nzsNlA/eBZVTlbKm7TuScWRUKXV9MVbd3ngyQN6ho=; b=Q2g4zNiCIQec+mOEYRvpDz6CmT9HP9nddjKZnrEnuWbLKYiXsWHAbwUD9E2ZGZAYb7UYWuUJ8ane0zMFPtxrLLb/xwks8VspO7nf3vEoIsgddiijLU3xXkr52a6nQKChSiLnwc8M9XuAlV1WM8E1FWuRVxjDkD1KQMitQLZOfc/YRDcVkdDq42gmaGmoMo/SgDAehlx8KN0pP64V3X3PWt9HYsbQGTMImDss0M1JmntFMvuZiK+T+imimGaV7Xmq5QbG2853nSkx7y2bG7yGVk3BxsmZN5JGYPg3cRqJEAhKTp3G3mRFi0lVGVkfyrqMkqBWeHLlrQ1Gyo8P/HmIyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m5nzsNlA/eBZVTlbKm7TuScWRUKXV9MVbd3ngyQN6ho=; b=Va+kcqu7shdW86LI8l79UVIOTMX9Ebx+eshg3/fg/USY5R0Vki97lq0XLN+vqr9qflJb5rbtbMZtyD/ppbGfr/rxF/gtD6nkRWZEZryJKe+fMBTgePKB/0gXO4Eg48ee3etlzcDunn7hvHJJL3HiC9vOR6YY5WSQ7X9TgwFtFzXrgUPwdcUXFQ7ux9JNGUGw8rV4XoCIg4HCGXne9XV5z9CQEfLySCBexLagUzl8cez4joBWdaqu2tzasgPDZTrRCX7hcCau5kPUBbfR+R/17O8XiBUyPnXQ9SylGkb5SMKCszCwfX5iNn2Ew5u0mwgMJ5cijtulQZWb/9o27xGj0Q== Received: from AM0PR04MB5412.eurprd04.prod.outlook.com (2603:10a6:208:10f::11) by PAXPR04MB8717.eurprd04.prod.outlook.com (2603:10a6:102:21c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.13; Tue, 17 Jan 2023 21:12:16 +0000 Received: from AM0PR04MB5412.eurprd04.prod.outlook.com ([fe80::8021:ef99:c515:b20f]) by AM0PR04MB5412.eurprd04.prod.outlook.com ([fe80::8021:ef99:c515:b20f%3]) with mapi id 15.20.6002.012; Tue, 17 Jan 2023 21:12:16 +0000 Message-ID: Subject: [PATCH] libstdc++: testsuite: Simplify codecvt_unicode From: Dimitrij Mijoski To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Date: Tue, 17 Jan 2023 22:12:12 +0100 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.44.4-0ubuntu1 X-TMN: [eHU+VnTz5CCvN6kYV8HTTpcMjkMqxowc] X-ClientProxiedBy: VI1PR03CA0044.eurprd03.prod.outlook.com (2603:10a6:803:50::15) To AM0PR04MB5412.eurprd04.prod.outlook.com (2603:10a6:208:10f::11) X-Microsoft-Original-Message-ID: <62127694c3cb81f447538be07506c48fffe2092a.camel@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM0PR04MB5412:EE_|PAXPR04MB8717:EE_ X-MS-Office365-Filtering-Correlation-Id: ca03d060-0e13-4125-4f18-08daf8cf821e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g7c0HzF3f4f62h/QgBI2p05hwYe5kRZISmway1QF5Z43C/KCmkk/hPtLA85igM9WiTPkrxAsyNJaa5nypUEhI4yG3Rpv4PUyi+rwsWSOOugwckJ/dqHYaYttA1SH8YmU70pNkm73ono8lSJ3rVf/S/IcaL2+u/TLy9ySkUfeyGHfVeE3fZLwRoWjt3PVvP3m92QkhqjJAJYL8+UPS6WhO/AJiVc1zCW3MBQwvF5kD/8FI0+5sYBBdm1cZbYGqXiQJgVLbHVa3SY4g4z92lVL3cDsxa7V1hOR5ssMNR1Jc9H4Yb0L8wceLqd9WuAGyieCxDA3DhXyQw++dC8XB0VYr+BwlBGy4+FxZsxeI0KPMRGLnLD6nTPTLM5AhlwgtjPilqj2QuevKl/E0QUCPoc8WAl+++XbmfoKFUJjKmDQJsz6UQeHo7BhmJCxVgiAHyI1vpeANrc8zeap3zGnuXzYNAQQYCVWK4S7Cm0nWIWOgM05A09CXp8EzPhZYekbK6/FATGVuNK8yAXfkKa4sJXFDwoTbT3pw/5k6V33OVPXwzLQIGdMMKMW0IKwImSaStEr8kGHulG7emurtp+WNuxmPQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RDJLaVZJdDVWSHo3djgxZms5VE4vbi9MYTk0VTNHblBwbkdML0MrSDZKNVY5?= =?utf-8?B?ZSt2aHVCL3ZtNjVSNzdaRjdEdzBGVWtXWXJURTZqRll2ZXlobGlOVDBGZ3lD?= =?utf-8?B?ZGw4N1U2d2lkSDlrc2JYNEhvcGQzQ1FXcVRqYjJvSTNsdkJSamVYQXRTYk94?= =?utf-8?B?eTgyZ280SDhZTEM3MWNLdFV3cmhPYVRZbkxxVktDV050NWRjNk05cVhNbWpT?= =?utf-8?B?MmxOSHI0UUpOQTlyWU1aZXprQTczcDI3blJZOEJwMytodEdkUy9ZYnQ5SGQx?= =?utf-8?B?ak56SlhFVG1EYTgzdDg1NmFxYm55SDRSSkRzT0RLcGwwM3diY3BCZ1kxYmJW?= =?utf-8?B?L3N0dVdmb3k5aldjVmlVSDQyZGw5MWd2Sm9PN3paOW5Pb2pFVi91amc5RHpW?= =?utf-8?B?QkNUbEVqU0RCUDJVOCtyeVZFMkFWcE1jUjRBVjBiNmgzaTZCYjlnQmthMGwx?= =?utf-8?B?MitkL2VLbndEVm5FT1E0MjVwSkVVRmdWTUdYK2ZIaXAzTURFMFNoMEhxc0tH?= =?utf-8?B?aCtrUFRyTEpiNVdHa3N2Rk9FNEo0eW0yS055ZDZBTHdrZklGSUFZMDlZeDdi?= =?utf-8?B?M3k3cDNDaUFGQXdPSEkxcTIrWnhCa0hwKzlzSy93dTdqUndBMlBDVkxoZUhy?= =?utf-8?B?bVA1WlluajJtb3ozUTBvM3R3K0ZxNjZyT2R6MHU2UmFJSmhtTEtOOSs0Mkc1?= =?utf-8?B?b1N4SzlWOFhOOXJpQTc3QW52RkNTUFhGa1hGenRjN2lCalRxYlppZlQ0MU1a?= =?utf-8?B?T2oxbHFMdzgwK0ZEaWNvOUE3MkliVkxvZWJxck14ekluN3RuZUw3bzh2QmJJ?= =?utf-8?B?NTZySWxXNnJrL2kyM1lJby9pLzVDbVNheHl4YjlmY0RSaWJ1bitUVHdNRkc4?= =?utf-8?B?ZHc2Rzh6VU9sWkdDYnRwOXpaWWxGT3NCNHppUlg1VUwxRmQxd3k3WTNVUm8w?= =?utf-8?B?S3YwYWxlMGp4eGdYUy9mdTZkaTNqTWRubjl0UTNubUtpdVdiWG1lK3dJZEsv?= =?utf-8?B?YjE1eVFsM09ZZzVOMkFvYVZWczY4bUpqU3BHT1JTbXhuUXo0clhRZUhuelJ0?= =?utf-8?B?QldOc2hEMnk5dEF2UU5rWWF1MmlSOW1IOU5FeXVZN3JkOGNxL3lIQWlTcWJi?= =?utf-8?B?K203cUtoZ1ZVR3ByclE2bGZYbmZRbDhvVmFsaFJ1WGF0RjRPQnlyZERQRzVa?= =?utf-8?B?Nk4vRHRkeGxnVE5xektQZEExb0dad0tNanA0VUlhalM4YzBkSFQxVEEyMWtX?= =?utf-8?B?N0ZhYXhwT3hJazRrYldSTnhYTkw4cURXa3IzRy9kY09vSnhYUUNjM3lrb2FQ?= =?utf-8?B?TnhrUFRvbjUrT01WcE1nakFHUVZjTnNZZENiUk1LcTIvQzJzWUJ4V0RjOXI4?= =?utf-8?B?Nk14a0E5ZU1qbUoyTU8rNllUbDhoejlDNUJKZHZSTThVUHFoSFhyWEtBM0ti?= =?utf-8?B?M3NYTXdYUU0xd0FRVzM5VVpHZlhqS1J2N2QvL3Q2RkkwSzVERk5jR0Q4d3p2?= =?utf-8?B?ZllYOCtLZ3JCQ0E2aVBqNzVtMXZqOFlkV1B3eE13ZnZLdHhGdUczcEUyaEpL?= =?utf-8?B?TGVORTI3Zzk2L3I5VmJLNko2dkh1ZWM2WGZWYnJBVWdSa0hOSWlraVRSMmd6?= =?utf-8?B?NVlSTEJrOFl5R1RBazJVQndDZUI0dWFWcFBKZVFUWnBycEdFNWRoWTUwY09r?= =?utf-8?Q?yFb9MgDoAHQYM1BxX2bn?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-03a34.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: ca03d060-0e13-4125-4f18-08daf8cf821e X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5412.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 21:12:15.9414 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8717 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Stop using unique_ptr, create some objects directly. libstdc++-v3/ChangeLog: * testsuite/22_locale/codecvt/codecvt_unicode.cc: Simplify. * testsuite/22_locale/codecvt/codecvt_unicode.h: Simplify. * testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc: Simplify. --- .../22_locale/codecvt/codecvt_unicode.cc | 18 ++++++++++-------- .../22_locale/codecvt/codecvt_unicode.h | 9 +-------- .../codecvt/codecvt_unicode_wchar_t.cc | 12 ++++++------ 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc b/= libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc index ae4b6c896..3d7393e4a 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.cc @@ -29,11 +29,12 @@ test_utf8_utf32_codecvts () using codecvt_c32 =3D codecvt; auto loc_c =3D locale::classic (); VERIFY (has_facet (loc_c)); + auto &cvt =3D use_facet (loc_c); test_utf8_utf32_codecvts (cvt); =20 - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8 ()); - test_utf8_utf32_codecvts (*cvt_ptr); + auto cvt2 =3D codecvt_utf8 (); + test_utf8_utf32_codecvts (cvt2); } =20 void @@ -42,21 +43,22 @@ test_utf8_utf16_codecvts () using codecvt_c16 =3D codecvt; auto loc_c =3D locale::classic (); VERIFY (has_facet (loc_c)); + auto &cvt =3D use_facet (loc_c); test_utf8_utf16_cvts (cvt); =20 - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8_utf16 ()); - test_utf8_utf16_cvts (*cvt_ptr); + auto cvt2 =3D codecvt_utf8_utf16 (); + test_utf8_utf16_cvts (cvt2); =20 - auto cvt_ptr2 =3D to_unique_ptr (new codecvt_utf8_utf16 ()); - test_utf8_utf16_cvts (*cvt_ptr2); + auto cvt3 =3D codecvt_utf8_utf16 (); + test_utf8_utf16_cvts (cvt3); } =20 void test_utf8_ucs2_codecvts () { - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8 ()); - test_utf8_ucs2_cvts (*cvt_ptr); + auto cvt =3D codecvt_utf8 (); + test_utf8_ucs2_cvts (cvt); } =20 int diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h b/l= ibstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h index 99d1a4684..fbdc7a35b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode.h @@ -15,18 +15,11 @@ // with this library; see the file COPYING3. If not see // . =20 +#include #include #include -#include #include =20 -template -std::unique_ptr -to_unique_ptr (T *ptr) -{ - return std::unique_ptr (ptr); -} - struct test_offsets_ok { size_t in_size, out_size; diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar= _t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc index 169504939..f7a0a4fd8 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/codecvt_unicode_wchar_t.cc @@ -27,8 +27,8 @@ void test_utf8_utf32_codecvts () { #if __SIZEOF_WCHAR_T__ =3D=3D 4 - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8 ()); - test_utf8_utf32_codecvts (*cvt_ptr); + auto cvt =3D codecvt_utf8 (); + test_utf8_utf32_codecvts (cvt); #endif } =20 @@ -36,8 +36,8 @@ void test_utf8_utf16_codecvts () { #if __SIZEOF_WCHAR_T__ >=3D 2 - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8_utf16 ()); - test_utf8_utf16_cvts (*cvt_ptr); + auto cvt =3D codecvt_utf8_utf16 (); + test_utf8_utf16_cvts (cvt); #endif } =20 @@ -45,8 +45,8 @@ void test_utf8_ucs2_codecvts () { #if __SIZEOF_WCHAR_T__ =3D=3D 2 - auto cvt_ptr =3D to_unique_ptr (new codecvt_utf8 ()); - test_utf8_ucs2_cvts (*cvt_ptr); + auto cvt =3D codecvt_utf8 (); + test_utf8_ucs2_cvts (cvt); #endif } =20 --=20 2.34.1