From patchwork Thu May 3 21:24:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 27097 Received: (qmail 46890 invoked by alias); 3 May 2018 21:25:33 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 46880 invoked by uid 89); 3 May 2018 21:25:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1316, 2cc X-HELO: sesbmg22.ericsson.net Received: from sesbmg22.ericsson.net (HELO sesbmg22.ericsson.net) (193.180.251.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 03 May 2018 21:25:30 +0000 Received: from ESESSHC023.ericsson.se (Unknown_Domain [153.88.183.87]) by sesbmg22.ericsson.net (Symantec Mail Security) with SMTP id 09.FC.30337.74E7BEA5; Thu, 3 May 2018 23:25:27 +0200 (CEST) Received: from ESESSMB501.ericsson.se (153.88.183.162) by ESESSHC023.ericsson.se (153.88.183.87) with Microsoft SMTP Server (TLS) id 14.3.382.0; Thu, 3 May 2018 23:24:24 +0200 Received: from ESESBMB501.ericsson.se (153.88.183.168) by ESESSMB501.ericsson.se (153.88.183.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 3 May 2018 23:24:24 +0200 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (153.88.183.157) by ESESBMB501.ericsson.se (153.88.183.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3 via Frontend Transport; Thu, 3 May 2018 23:24:24 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by MW2PR1501MB2011.namprd15.prod.outlook.com (2603:10b6:302:c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.20; Thu, 3 May 2018 21:24:21 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Define GNULIB_NAMESPACE in unittests/string_view-selftests.c Date: Thu, 3 May 2018 17:24:08 -0400 Message-ID: <1525382648-30186-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: DM5PR10CA0014.namprd10.prod.outlook.com (2603:10b6:4:2::24) To MW2PR1501MB2011.namprd15.prod.outlook.com (2603:10b6:302:c::11) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MW2PR1501MB2011; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2011; 3:zkSMFpqVdf0+4dimvsZGoNMgC1s+RstPY5bhNSUTfStSTYbRBY7VcrqCx20l/1KqMvLTK9wWzLr8q+Bbt7+0XY22X2o+lVUXZUZlDb6NwyrLfY/M0XeXyAFEmcMLZVUp5OGMkF5gTw2kalxIUpNnAbqLzV26R/tmVUenU5bTrVD2q6WPGvTEzTatdDH+UGRQsbxHtlNV/xlWfFz5oiKw70Laz9khsCo1HokU5pYbmsvRML/bmpuE/KQHzMeZJRJ+; 25:o6RNH41xA2kuRWytcUXxXiryQrwcxvnBJqV22fsQRIxKCcRkeI4STsOD2TR2XATX1fdfRY8br5PRMfVNcL+cAH9vICOnBE6MW0+qwjpISiqbb8W82bA9xxOelvAUbaFDpnSY1JxOuQyybqqvQakAd2TTBPV4uU9J36lC7LLLcQyyZIjjo1vJ82nLfNokQ4F5Tir59L9y16mfYBgoK0UcpD9kyjKCIRByGZ87TFBhxHisYkUDlJqT7iX0pmyWKhJerqBD3+oK4cgclYnaE4/YVkkMHHdYlP7Rszg8ddPUUy81keZFcjLsGZhUzuvMsshjoTZeof/AtGyi0b/v0q67bQ==; 31:v2TunTWuzBSkl5a7+ICfgmNprhp9vNEMLMgBeG3klCHgFsTDP8JZqMG5zJzrpxp/CK6l8h4dOEc26UfoEP0H9vBoekK8KjDMrObBMpPfp0lRvxUFc1jWCS3kwh7EfZlE9tf8x20ksbfsotIF7+GOrKtW786pSWCWIjLeh9stGnoQN3o+h1vmm83xV4GC/8d0cd3k3td7vG+6FSia/p+Mv8MKrGA1cfnTE522C+A1qAE= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2011: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2011; 20:kPPSbnO0N3s2hjXgHRRg/3TAmvJWR650JutPHWeJdHzZ6YWVLADcUzsfCJSRHoxKM9SFn+Iy5JSuULNcQnsGhbrAMD8kCfW/ETcCaysIgvRl34e1peCZy00sBh7Er0hyycfsoEbYAK0pAaiQrpjixsro7IjKrqdZNuRK0/DFVTuJjP/z1vDloZ/uroeOewPqPqkuDjDCdPMV2YOQDZu0XTK3NV5yO0R+QvRwdozZ6O24HK1p2UOHi0BLL/eO0VLJPTzPiLL/sg1tPLWXZRJeJxggj2nOrjrV0WR9KH1z9IYdzJbN306hvzQJhXxqldnGoZN9DbuLI7gEJd1bEWMMgZV+KI1UiZ7SXH7jGu6zIms2MB1oMMGhfA+roNMep4qKxYrMf3M8N7/hoev+muN5L21jIs8H1H4ReW1HtQEFpE8eyNvhzMInYOYuVYUQY34EOJzNOApTOTvXzR3qFUVaqO5Kb4L6ix6UE/VfefFTh+gt9xhL4cYv+ymg+tD/vmrF; 4:YqikQ+0Cc3QgStyjwxEqn11ujD1xIuctVJrAm9dflx4KxrxQutqkdR6QdpeEMxSseLtrx5s0+ziirrWvLqDKh2Q5EI0KdJ6qj5hA8LU17xCh0I2urnVyVbMbHjsncw2AmQgjZes6Bg27r7KLz3hqFAiTnZjeidO3kTuHeQgWL4vuaa0QyPklcgeZoMvN804cCQIiXJdUV5fxO1VTy9lYj4a+W8x35Ae+yyJO/kzCf0ckG1bOh2OQLDb9Fku8FcNhPvmpnwPeuJrYxTUoZmpo6A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:MW2PR1501MB2011; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2011; X-Forefront-PRVS: 066153096A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(346002)(376002)(366004)(39380400002)(189003)(199004)(54534003)(8936002)(6116002)(26005)(3846002)(476003)(107886003)(2616005)(956004)(25786009)(81166006)(81156014)(97736004)(8676002)(6512007)(6486002)(486006)(105586002)(44832011)(47776003)(5660300001)(6506007)(50226002)(1857600001)(48376002)(386003)(52116002)(4326008)(50466002)(59450400001)(51416003)(68736007)(53936002)(66066001)(186003)(86362001)(6916009)(2906002)(478600001)(2351001)(36756003)(2361001)(7736002)(106356001)(6666003)(316002)(305945005)(16526019)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2011; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR1501MB2011; 23:QXbbi/VM3Uotu9WL4HcdMyFFrTXp0e+hj9OEUGD?= =?us-ascii?Q?dZ4mYmGNpgF1UAspE99Iy9FTQRgTUVP8KA6bDBk+CI5zMim54lN0oowEPHuc?= =?us-ascii?Q?85V8d4k0kHdgj74yG13ibi7GPgUA0YkYxnkIyCc+uNyRMySS8cNxoBuONdz5?= =?us-ascii?Q?xz9QQcL2xE6WvOd5FqXbcIyDQ3/HfLgGIr84eGk6/47+KSQUzKhb7tjEtVvo?= =?us-ascii?Q?6Th3T9tpQvwxoAEn/xapn+TW6xooK8VhRI7/rMp1ymaispdBFjENfr8myWna?= =?us-ascii?Q?7QsxtPkX8sKPX8hySfgJrRwIwKhsrnepdfcML7cmKcmrMfHPjp6fHwruqx4X?= =?us-ascii?Q?HTqESibfJBQhgxX5djpLDMyslUor1ZH4CeAbUqLK9JX+1P258n7JkAZFN6Dr?= =?us-ascii?Q?mQg9AsVkmY3e9xZ6LxhUdfXSbp0WHNHPVHCK7O6DZlNG7PDxuwcagkkIeQfl?= =?us-ascii?Q?jQC/6frmAmz0AJn5rnpienjl9bb41qbI5jOiZqlaSn4xZt2bKu+QPFp5Q6pT?= =?us-ascii?Q?Qr2z9cuTZrqPjrYIeMG8IlZI4XbJvjPmPEiOPE3Yj1oo7taexqos1Q3rAefQ?= =?us-ascii?Q?ZY5HTsrTNQ/K7wLWojvXapScUxyi1otkZogyigd2/o0gJQqclTJQWwB6E2AD?= =?us-ascii?Q?z3BDYjRpKCIiSc6QGzRvuKbahlr1zc0El3psrd30gzhBrniw4NX8OMHbNSsX?= =?us-ascii?Q?FI0V3FQIsNWzDvwYAgS00Zw+IeO8YkEinajbmyrJDZVGGuNFl6HRc2zwC+5i?= =?us-ascii?Q?j+21NlR+WkLlNIm5vVkQFvkHfhbuZ9jmvNGTgDhBePDkbbjX3RldyxZRL1hg?= =?us-ascii?Q?kK7BwtKpws6ELV3Ce5D/D6mHps9xB1/VyW3gITgQ+fsaGwedpcK7KSrz/yl0?= =?us-ascii?Q?Li7SGN0OqYJ8GTKTd/gpwgGzRvzCp5OrJz/bCbuEvLGvYbtepkDu68x9uvBV?= =?us-ascii?Q?67M1w7rahpTEciyTwcxfJcDJug0g8ups+IvYWZC7iNFfztUzluyusQYQz2wj?= =?us-ascii?Q?wUJ2JZx6zio4mUeXToEm23YovhOWw2xbiSdvPCKckrJhGpPDWupCWlhiChle?= =?us-ascii?Q?s7Vv/EWfeFcAi6RxSKGS2kjp4f1RkiO/pxgLRzWLL38Vk3MpGyagjn4kIhFs?= =?us-ascii?Q?tppFYBQCjgR8j50Skf4CPh4bSC4XH3SwbSd6SYJypmFZHad0bufVMJm+kc/D?= =?us-ascii?Q?yGiyg4ngeroH6k2308AYRS0/rU1LEwpYI6mZ8P9tpwqIggs4lAdSdtCiM46x?= =?us-ascii?Q?CkLlUztM7ype0z1mU91sTSGZ8RP4hFaV9ACd+28pm?= X-Microsoft-Antispam-Message-Info: 3Czzx8/PIsRSz0oWwdqlT721iYBcW2nIbxq/kqrDkB8y+e8DwvPsn+/jhWcTO/EHWEtPvP801W1sWIu1sAYc8XwlMa2I3y/4+Z0GvcJT9gOy1c7rnIEGHY4Co4hPYqn0qIuXzeRU5jM+CBR1gIVgQHACpw8tWHFjI6srJydTutGjconSheSRiWRyJC9ySjsv X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2011; 6:gXy0o1NoF9O3dpph529Dj2ixwhjTwj5TwQoqsT0fWmVznOncHVcV6kJFAh7qqBRcmPb5atvugunbULRSSyLD30ZvbRf5j2+QM8iYOYHMJVPdPoz7DwNmOisXcreQflwjLzdskXKAz5NGEvVTZ7npqjOV5v66Khl7n9bw8GszaZuR9sZ1U1BkkKgMiXLMuu2FywV9IB1CNnpUWzgZsK5fDEc3QpkjOHBF9C9v4Fkc5rOycnxsG4lMoxLGpgvZkqrGKM8htyFJafBgeHVCcqcjUjnj1tOUXGnvgXj9gawcOl57ATKePTehFYfJuGhpY8LNNtJ4sG5X/kaw9ScbrVYdgV/fPh4svqMK+kqIPvEwOaM05BA2ZuICx3q7z5MQ07e9roh0AoF0iwZAUZYbr2LioLKpuhIW5IAs6Opi7JzSPLYfuJCTBkEhjUBOwgpmWqKgSJm2IcVq/xf5RDgcrEwyYQ==; 5:um4MAAoCUmSCZbXcouzljFO074jjeJKXNMpcCDpsZ+7pfiH6ngO/OGbcXNoFT/HjMCqeo0RGa22swSSsK2lGFjs7XPPNwjcz1QrmRuQxShl6LCqdbD/woxi/j3zug98GwiQN3hAjw8VEN81jZx5faAEWOFaf42hsv0MK9wDKU6Y=; 24:Dcl6A9AIGMnbtYHiUqNNdCwvs7tWhQk9f63nnyMVdEnqRIt0rLizCGo2A9DmVOm0DKiGbLvBr7rgjJW4DFTu7AZ/RXM30swH/IbRRnCtXO0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2011; 7:mF3mpxjMcdkxhikRPou9+0qIFBMFpP8okMlIPu6jM3QgyaKAzcCzrCs4l9qvXS4/ZpFHsQbtV8qVPtW86X4SUEbfHUJ39rWV/+dxiWbdrBDgW2vkYQ/8dPZXve29LW/1c/SbAcsknu9Mx7Y+SGH7S4JRs40pisxccft+gcqR/YvTVIzIsC4gBo4aCrGqbRS9O5QC9dqNMJtWdLPofZK+ly0iDRuLWvXeNhpBN/pIlItTE5GiNljCShGRuqd3dTpS X-MS-Office365-Filtering-Correlation-Id: d65a2ad7-b465-4b74-4664-08d5b13c3cd3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2018 21:24:21.6457 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d65a2ad7-b465-4b74-4664-08d5b13c3cd3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2011 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes When building with x86_64-w64-mingw32-g++ (to test cross-compiling for Windows), I get this error: unittests/string_view-selftests.o: In function `selftests::string_view::inserters_2::test05(unsigned long long)': /home/emaisin/src/binutils-gdb/gdb/unittests/basic_string_view/inserters/char/2.cc:60: undefined reference to `std::basic_ofstream >::rpl_close()' This is caused by gnulib redefining "close" as "rpl_close", and therefore messing up the declaration of basic_ofstream in the libstdc++ header. The solution would be to use gnulib namespaces [1]. Until we use them across GDB, we can use them locally in files that are problematic, like this one. gdb/ChangeLog: * unittests/string_view-selftests.c: Define GNULIB_NAMESPACE. --- gdb/unittests/string_view-selftests.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gdb/unittests/string_view-selftests.c b/gdb/unittests/string_view-selftests.c index 182a5df..55ffe64 100644 --- a/gdb/unittests/string_view-selftests.c +++ b/gdb/unittests/string_view-selftests.c @@ -21,6 +21,8 @@ the "real" version. */ #if __cplusplus < 201703L +#define GNULIB_NAMESPACE gnulib + #include "defs.h" #include "selftest.h" #include "common/gdb_string_view.h"