From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2071.outbound.protection.outlook.com [40.107.20.71]) by sourceware.org (Postfix) with ESMTPS id 371F93858CD1 for ; Fri, 23 Jun 2023 15:35:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 371F93858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D5qa5Tw0VmV9iJlVWAT/wCsihaPj05Pp7zAiIFtRyZg=; b=IWCmey9xND2ZrqSXSDvgtDLnVaqynM/Xy0NEsAnZNnYmEch/1ock45+bE3hygDppTI7CVFiKgEB2HnRB4fySym7/4y/kHY19/aXktbi4MGSnTRdYG0ya+lYNpYb+TXN5aVjWxljrsdNl01ZXQyUOTHGj39AwO+zQY4Kj6sR8MS4= Received: from DUZPR01CA0040.eurprd01.prod.exchangelabs.com (2603:10a6:10:468::18) by DB9PR08MB6699.eurprd08.prod.outlook.com (2603:10a6:10:2a7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Fri, 23 Jun 2023 15:35:36 +0000 Received: from DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:468:cafe::fd) by DUZPR01CA0040.outlook.office365.com (2603:10a6:10:468::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26 via Frontend Transport; Fri, 23 Jun 2023 15:35:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT009.mail.protection.outlook.com (100.127.143.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26 via Frontend Transport; Fri, 23 Jun 2023 15:35:36 +0000 Received: ("Tessian outbound d6c4ee3ba1eb:v142"); Fri, 23 Jun 2023 15:35:36 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ea46dda0fd7798b5 X-CR-MTA-TID: 64aa7808 Received: from 18a1d478c660.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8676C46F-2D9C-4901-9639-BF0C585DF828.1; Fri, 23 Jun 2023 15:35:29 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 18a1d478c660.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 23 Jun 2023 15:35:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cdmqwm+s4MXFuZH4sy6irCEoMPrPtL1X7McuJYfeXG7DoWQbX7zK7IhcinSYNwTRY8sQPmbODfQaugkOtE3R/q8k8S71GBhW4UQMdptkXR36pg3NQfGasKKvJVGAPv1YQ6pFvDzjnZ+6FUHCzy1lsCc5B10xWdY+KoOH0x6+q3gacNMBLn8Ifj7fdgMw7GP/f8VzxVcgeCP/fuL+Kt8TEX102O43tnhiblhYlNbylyYI0mXpS0uuJJkYanZ4/c1d7Q/Lvhhqqo7JP2k6/6Wiox4lYAJ5PT2fdIlIlnUtoXc2vDIBqs8uT3I4tWRXrI1D/yoeEpz7OMCFV8jPW3gO5g== 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=D5qa5Tw0VmV9iJlVWAT/wCsihaPj05Pp7zAiIFtRyZg=; b=dkpiBpwI3dntP677QpAZokKow9cR2R7RY++xT5kdbAkXVD4+XacHqJNe4iogw8cmD1OpNMXaeQWnFfyGrffY+ehV+rlzkadkkKG4sxCx3PUlRCu69U3wXfNYYpYWitz46/0L6W1JGhmQnj1uIwLbAT05xN6FBf14wYk2kTNJUejE8Y7Pfdu6Z89mCQ3dOu24gDgtUOQLHPDRF4sim33VnmcUK55C0nzcM2sXsatsaA8E8tgpA/TMXJicyxdP2bfIQnRHO30XwZ1xPkPzHUSlNJGj8qNeY4f+q3FpZXvxIDpH72m51Ltgw1pn+V95MWo/C0efJMvAIKlPrbdoIK/avQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D5qa5Tw0VmV9iJlVWAT/wCsihaPj05Pp7zAiIFtRyZg=; b=IWCmey9xND2ZrqSXSDvgtDLnVaqynM/Xy0NEsAnZNnYmEch/1ock45+bE3hygDppTI7CVFiKgEB2HnRB4fySym7/4y/kHY19/aXktbi4MGSnTRdYG0ya+lYNpYb+TXN5aVjWxljrsdNl01ZXQyUOTHGj39AwO+zQY4Kj6sR8MS4= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) by DB9PR08MB7559.eurprd08.prod.outlook.com (2603:10a6:10:306::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Fri, 23 Jun 2023 15:35:28 +0000 Received: from PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::202a:45b7:3be8:47d5]) by PAWPR08MB8958.eurprd08.prod.outlook.com ([fe80::202a:45b7:3be8:47d5%7]) with mapi id 15.20.6521.024; Fri, 23 Jun 2023 15:35:28 +0000 Date: Fri, 23 Jun 2023 16:35:25 +0100 From: Alex Coplan To: David Malcolm Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] text-art: remove explicit #include of C++ standard library headers Message-ID: References: <20230623143602.83510-1-dmalcolm@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230623143602.83510-1-dmalcolm@redhat.com> X-ClientProxiedBy: LO4P123CA0041.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:152::10) To PAWPR08MB8958.eurprd08.prod.outlook.com (2603:10a6:102:33e::15) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: PAWPR08MB8958:EE_|DB9PR08MB7559:EE_|DBAEUR03FT009:EE_|DB9PR08MB6699:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b57557d-74a6-440c-a522-08db73ff7d6d x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 4ZWPnGiInRW6IUaFomoOponaDFMRYjCYExNJAI7AiIa+RWLJAEQxxOjbbgbbX7YYTkdxVRoHSBQOiN11DT3zajcKxF3xqa75hwmQ8KDIZrSwJXgAJpC7N+2GmRwV/rdi+PvScd+sNdy7ctYXprtiub1y3EL356Xw0yY4FLTrf9gBTrgq1UWFib9WL1Jw6y3QP1vgVthu6hjlOEmmQr8tQnuLotzPaskZOHkb/4pNqLUWT9JUbgSUKgtjpcsxNYIiEgC0cX9ijNVthbK0Kn94ph4WzSdg2mTA4WqYaj+Kg7P4a1sYVj0eQyMnrJGihbw0K3pux0iSa2sg7jTCY3FY3zbe/rLBivovTPo5ngptaNtlmFcJy3Q+jyT/dtjBLNb3dE/UNQCuOx/mtGb3JlG3kKCalXyxMPlSl3s9A1Oc4nbiYZ73bSwxS8mH07qy3b6kMfUtSBc4uQpPO7/3/uK5REr2vVN542eq9OUc0u0lTf5HPq1g4f70V4TBeXEZv8Ui+IEmB9/Tmv4sNIAIL8lyD73m4QjXWq+CtKo7CnW28gI= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAWPR08MB8958.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(396003)(39860400002)(346002)(366004)(136003)(451199021)(44832011)(30864003)(5660300002)(53546011)(6506007)(2906002)(26005)(6512007)(8936002)(8676002)(186003)(41300700001)(83380400001)(2616005)(478600001)(38100700002)(86362001)(66556008)(6916009)(66476007)(316002)(4326008)(36756003)(66946007)(6486002)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7559 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 53cf4562-5d1f-494e-62fd-08db73ff78a7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hz+aaSaWQZ1bqFjt3hbAOHdSwp6Y5nxjJt8bRV4ZKcN3vmRysZHKXO2zXcSBWyOZS2QyqFV3za63/Bo9ZDbvNyOCZ0nk8yDkF/qPITlQm2YdjG1renhKJIURFcd74ucygDLDUbSmlbXKjkg+jS/Nmkt1EH7nUAAitLwiYpfYELpzQYl5rG6iPOxsDbewawdOWitmRjMaaVH3LtuDKMW7eVD6LPHGx03up/nNVrciXzmKCU2Pk+MglyOgcexnr1/Df9pBXNIE7TG5r4BL08YuJ1b2xRa6UbDMakLwEvH8lQMunBDxyw2/nmP6usbSl/Lf9biJDlnoqyLLs/c3s6XUhUKIeXM1nKMToZBXhAUOGD0bC8ZSiNhSeQ0qwetLnHDMfkf7sNbzRYT4bvgyUjN0V9Jj2MqFqqjUObsXJJ6xAYQFIclRZ10zai5Q/Y05AUtVbKmCW0puNoY7kmga4szYrg/PjQ9xUGnI+MqegeKuNzLi+qyfLh3f4W4EFyq785Lydyv/SDnx1BJy99cfWG31kEIStzgiINAd+LiRfLNPyiJJwqEFRE760el3wgQ1TXFn5vQilk80v54O2dXaZuNgFns38Q2q2FiGbtTmt+REa6Sx4g/G5/GH5l1XeXR45NobP/RDawePOYIrxOJkhkIVizvLRl5MsijNvyefYHL4kPF0RdmMa6757572W1S7icPUDcVGMXm9icPt9WrMVBJUtP8Pij4ncIOU2JWUr6kn/I0= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199021)(46966006)(40470700004)(36840700001)(336012)(316002)(83380400001)(41300700001)(6862004)(8676002)(8936002)(47076005)(2616005)(186003)(82740400003)(356005)(81166007)(36860700001)(53546011)(6512007)(26005)(6506007)(40460700003)(6486002)(6666004)(478600001)(40480700001)(30864003)(36756003)(86362001)(4326008)(70586007)(70206006)(44832011)(2906002)(82310400005)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2023 15:35:36.1249 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b57557d-74a6-440c-a522-08db73ff7d6d X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT009.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6699 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY 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: Hi Dave, On 23/06/2023 10:36, David Malcolm wrote: > On Fri, 2023-06-23 at 12:52 +0100, Alex Coplan wrote: > > Hi David, > > > > It looks like this patch breaks bootstrap on Darwin. I tried a > > bootstrap on > > x86_64-apple-darwin and got errors building selftest-run-tests.cc: > > > > In file included from > > /Users/alecop01/toolchain/src/gcc/gcc/selftest-run-tests.cc:31: > > In file included from > > /Users/alecop01/toolchain/src/gcc/gcc/text-art/selftests.h:25: > > In file included from > > /Users/alecop01/toolchain/src/gcc/gcc/text-art/types.h:26: > > In file included from > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/vector:276: > > In file included from > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/__bit_reference:15: > > In file included from > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/algorithm:653: > > In file included from > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/memory:670: > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/typeinfo:377:5: error: > > no member named 'fancy_abort' in namespace 'std::__1'; did you mean > > simply 'fancy_abort'? > > _VSTD::abort(); > > ^~~~~~~ > > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/ > > Developer/SDKs/MacOSX.sdk/usr/include/c++/v1/__config:856:15: note: > > expanded from macro '_VSTD' > > #define _VSTD std::_LIBCPP_ABI_NAMESPACE > > ^ > > /Users/alecop01/toolchain/src/gcc/gcc/system.h:811:13: note: > > 'fancy_abort' declared here > > extern void fancy_abort (const char *, int, const char *) > > ^ > > > > Please could you take a look? > > > > Thanks, > > Alex > > Sorry about the breakage. > > Does the following patch fix it for you? > (only tested lightly so far, on x86_64-pc-linux-gnu) Thanks for the fix! I can confirm this fixes bootstrap on x86_64-apple-darwin for me. Cheers, Alex > > > Dave > > > > gcc/analyzer/ChangeLog: > * access-diagram.cc: Add #define INCLUDE_VECTOR. > * bounds-checking.cc: Likewise. > > gcc/ChangeLog: > * diagnostic-format-sarif.cc: Add #define INCLUDE_VECTOR. > * diagnostic.cc: Likewise. > * text-art/box-drawing.cc: Likewise. > * text-art/canvas.cc: Likewise. > * text-art/ruler.cc: Likewise. > * text-art/selftests.cc: Likewise. > * text-art/selftests.h (text_art::canvas): New forward decl. > * text-art/style.cc: Add #define INCLUDE_VECTOR. > * text-art/styled-string.cc: Likewise. > * text-art/table.cc: Likewise. > * text-art/table.h: Remove #include . > * text-art/theme.cc: Add #define INCLUDE_VECTOR. > * text-art/types.h: Remove #include of and . > * text-art/widget.cc: Add #define INCLUDE_VECTOR. > * text-art/widget.h: Remove #include . > --- > gcc/analyzer/access-diagram.cc | 1 + > gcc/analyzer/bounds-checking.cc | 1 + > gcc/diagnostic-format-sarif.cc | 1 + > gcc/diagnostic.cc | 1 + > gcc/text-art/box-drawing.cc | 1 + > gcc/text-art/canvas.cc | 1 + > gcc/text-art/ruler.cc | 1 + > gcc/text-art/selftests.cc | 1 + > gcc/text-art/selftests.h | 4 +++- > gcc/text-art/style.cc | 1 + > gcc/text-art/styled-string.cc | 1 + > gcc/text-art/table.cc | 1 + > gcc/text-art/table.h | 1 - > gcc/text-art/theme.cc | 1 + > gcc/text-art/types.h | 2 -- > gcc/text-art/widget.cc | 1 + > gcc/text-art/widget.h | 1 - > 17 files changed, 16 insertions(+), 5 deletions(-) > > diff --git a/gcc/analyzer/access-diagram.cc b/gcc/analyzer/access-diagram.cc > index 968ff50a0b7..467c9bdd734 100644 > --- a/gcc/analyzer/access-diagram.cc > +++ b/gcc/analyzer/access-diagram.cc > @@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see > #define INCLUDE_MEMORY > #define INCLUDE_MAP > #define INCLUDE_SET > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "coretypes.h" > diff --git a/gcc/analyzer/bounds-checking.cc b/gcc/analyzer/bounds-checking.cc > index 10632d12562..5e8de9a7aa5 100644 > --- a/gcc/analyzer/bounds-checking.cc > +++ b/gcc/analyzer/bounds-checking.cc > @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see > > #include "config.h" > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "make-unique.h" > diff --git a/gcc/diagnostic-format-sarif.cc b/gcc/diagnostic-format-sarif.cc > index ac2f5b844e3..5e483988027 100644 > --- a/gcc/diagnostic-format-sarif.cc > +++ b/gcc/diagnostic-format-sarif.cc > @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see > > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "diagnostic.h" > diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc > index 7c2289f0634..c523f215bae 100644 > --- a/gcc/diagnostic.cc > +++ b/gcc/diagnostic.cc > @@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see > message module. */ > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "version.h" > diff --git a/gcc/text-art/box-drawing.cc b/gcc/text-art/box-drawing.cc > index 981d0b095cf..7d499216806 100644 > --- a/gcc/text-art/box-drawing.cc > +++ b/gcc/text-art/box-drawing.cc > @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see > . */ > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "text-art/box-drawing.h" > diff --git a/gcc/text-art/canvas.cc b/gcc/text-art/canvas.cc > index f229612c919..26ea0517182 100644 > --- a/gcc/text-art/canvas.cc > +++ b/gcc/text-art/canvas.cc > @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see > . */ > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "pretty-print.h" > diff --git a/gcc/text-art/ruler.cc b/gcc/text-art/ruler.cc > index 80c623f77ba..3323a055bb6 100644 > --- a/gcc/text-art/ruler.cc > +++ b/gcc/text-art/ruler.cc > @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see > > #include "config.h" > #define INCLUDE_ALGORITHM > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "pretty-print.h" > diff --git a/gcc/text-art/selftests.cc b/gcc/text-art/selftests.cc > index 60ad003b549..25d81c1be89 100644 > --- a/gcc/text-art/selftests.cc > +++ b/gcc/text-art/selftests.cc > @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see > . */ > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "selftest.h" > diff --git a/gcc/text-art/selftests.h b/gcc/text-art/selftests.h > index 706a1d8b5d6..ba29f692697 100644 > --- a/gcc/text-art/selftests.h > +++ b/gcc/text-art/selftests.h > @@ -22,7 +22,9 @@ along with GCC; see the file COPYING3. If not see > > #if CHECKING_P > > -#include "text-art/types.h" > +namespace text_art { > + class canvas; > +} // namespace text_art > > namespace selftest { > > diff --git a/gcc/text-art/style.cc b/gcc/text-art/style.cc > index 00b056336fc..85ad49ee809 100644 > --- a/gcc/text-art/style.cc > +++ b/gcc/text-art/style.cc > @@ -21,6 +21,7 @@ along with GCC; see the file COPYING3. If not see > #include "config.h" > #define INCLUDE_ALGORITHM > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "make-unique.h" > diff --git a/gcc/text-art/styled-string.cc b/gcc/text-art/styled-string.cc > index cd176b2313f..a0cc187c8cb 100644 > --- a/gcc/text-art/styled-string.cc > +++ b/gcc/text-art/styled-string.cc > @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see > > #include "config.h" > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "make-unique.h" > diff --git a/gcc/text-art/table.cc b/gcc/text-art/table.cc > index 42cc4228ea6..71a10246257 100644 > --- a/gcc/text-art/table.cc > +++ b/gcc/text-art/table.cc > @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see > > #include "config.h" > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "make-unique.h" > diff --git a/gcc/text-art/table.h b/gcc/text-art/table.h > index 5e6c8ffb836..2dc5c3c41cb 100644 > --- a/gcc/text-art/table.h > +++ b/gcc/text-art/table.h > @@ -23,7 +23,6 @@ along with GCC; see the file COPYING3. If not see > > #include "text-art/canvas.h" > #include "text-art/theme.h" > -#include > > namespace text_art { > > diff --git a/gcc/text-art/theme.cc b/gcc/text-art/theme.cc > index 54dfe7c9213..19c39fa7df7 100644 > --- a/gcc/text-art/theme.cc > +++ b/gcc/text-art/theme.cc > @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see > . */ > > #include "config.h" > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "pretty-print.h" > diff --git a/gcc/text-art/types.h b/gcc/text-art/types.h > index b66188ae19c..dc2aba24440 100644 > --- a/gcc/text-art/types.h > +++ b/gcc/text-art/types.h > @@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. If not see > > #include "cpplib.h" > #include "pretty-print.h" > -#include > -#include > > namespace text_art { > > diff --git a/gcc/text-art/widget.cc b/gcc/text-art/widget.cc > index e6e544d5035..b64a6236a5c 100644 > --- a/gcc/text-art/widget.cc > +++ b/gcc/text-art/widget.cc > @@ -20,6 +20,7 @@ along with GCC; see the file COPYING3. If not see > > #include "config.h" > #define INCLUDE_MEMORY > +#define INCLUDE_VECTOR > #include "system.h" > #include "coretypes.h" > #include "pretty-print.h" > diff --git a/gcc/text-art/widget.h b/gcc/text-art/widget.h > index 91209444bf7..8798e436d94 100644 > --- a/gcc/text-art/widget.h > +++ b/gcc/text-art/widget.h > @@ -21,7 +21,6 @@ along with GCC; see the file COPYING3. If not see > #ifndef GCC_TEXT_ART_WIDGET_H > #define GCC_TEXT_ART_WIDGET_H > > -#include > #include "text-art/canvas.h" > #include "text-art/table.h" > > -- > 2.26.3 >