From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77921 invoked by alias); 15 Sep 2016 17:47:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 77905 invoked by uid 89); 15 Sep 2016 17:47:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 spammy=TOO, 160915, H*f:sk:1473958, H*MI:sk:1473958 X-HELO: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 15 Sep 2016 17:47:08 +0000 Received: from ESESSHC020.ericsson.se (Unknown_Domain [153.88.183.78]) by (Symantec Mail Security) with SMTP id D3.D6.06563.89EDAD75; Thu, 15 Sep 2016 19:47:06 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.78) with Microsoft SMTP Server (TLS) id 14.3.301.0; Thu, 15 Sep 2016 19:47:04 +0200 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; Received: from [142.133.110.144] (192.75.88.130) by DB4PR07MB393.eurprd07.prod.outlook.com (10.141.236.16) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.619.10; Thu, 15 Sep 2016 17:47:03 +0000 Subject: Re: [PATCH] gdb: Use std::max and std::min throughout To: Pedro Alves , References: <1473958336-23920-1-git-send-email-palves@redhat.com> From: Simon Marchi Message-ID: <4e2937a7-f70d-574f-75b8-78faab90fddc@ericsson.com> Date: Thu, 15 Sep 2016 17:47:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1473958336-23920-1-git-send-email-palves@redhat.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CY1PR01CA0021.prod.exchangelabs.com (10.163.94.31) To DB4PR07MB393.eurprd07.prod.outlook.com (10.141.236.16) X-MS-Office365-Filtering-Correlation-Id: 98fca44a-1b48-4752-80f5-08d3dd904db8 X-Microsoft-Exchange-Diagnostics: 1;DB4PR07MB393;2:oqFsEx91VPntW1DrijKBDOGSQRyuHobul4qlknAKWXPjcg4DfcSGfqwD99aCKgXLjxiwnPyk4jhLagLjnDgxjFTZCGblbOd5MC7qSOB5oOygYqhCZ2JGXUD8OoUSnVn08qyT3ge5Fq3zTZlo1zJ4GiJEGDAa6H20X+NcmuO0L6i94BssyqOH4QPKk+X9UKmD;3:FaUIwvT0Ymn2Icc91ST7T+XDqmu7yPSgc075cR0awBsQAsOp1JBECcNqzIPyfnD2IS1vIL2kJh9axea1RSSA/y+17eUqxhW5p+bwZHsfEBxT8DBv/moQrQ0AfsCkPIzr;25:iJOvh95PjGnvxea0V5qVFBTf5UU/hElj1xW6124pahBnG7DLRbBDrPU1tfuWW2s1fWNYgl3axLl9Xr0S61ihXmU8b0fnaPj++f2O3HeMikpOVFQBtLT3Sd5eIc85ngMB2VOEVMkKgDSDCa2/lAAwC5o4UeFXaP/Gl4CwqbLO4GKmZwReUd6HygJTdZqBJe4ev7edw7ifYW40DIQEQgxB+K4KhgzwbxSV/XChuwXGfHtYmLBap+Lift8d4LhLOZByUDZ7ZOFcV8390IHmJJKVj0ygFmyQ+cPm9GlB6lGk0BYpfig0G7g9fIXJXHmATLnzRDuxtiiriazaHm2axhJaafy/dIolS0VooqAmgQlvM6K8iswzJ4uf80I9GanWzIEjgiSbcLqtdFpLEJeLBgWTQ7qOOrwnKh4AMUpl8JYZlHI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB4PR07MB393; X-Microsoft-Exchange-Diagnostics: 1;DB4PR07MB393;31:J0EJkECklufxPRRCOmkgV21o1QEeEgEhb5bU4KOgASqbv4r7sAp1BQRDIwPPLwnNPUKkj9BwW1fg9iUI3mL+SbqHWJRXyndzhKUgXWktnapQn/97UPclU6WXYwKPu41M9qDSe+aNr6xgPZ1EecXQOeoy+o2r44E8BEbHeW1i2mwdXByix1Q6ZDWM5eD1GCA9VYln0aQPybT1sXkuQucvyRWpXGRRhFdTz2X8eUqnYgA=;20:mu0PgkpU31J+qDAiAovWd+6MSD5aqGnAcfYgt2On75DpZH10/pK0EVxxjk6KEYtAK1mSs2+qeDa6dnaz7gIt29YVSSl4fXwWIVMd7RpeqYUd+jkO9gKUj5TJfkCtKnGHNycwxi9NFQ8aI3mxsCUrSubOO+tz9FQI+UaAk4X6lBN2nMn28WOKu8p0KccwHjLNDUAbFwtAXLydJMbcNbgFwvN9F5oeLXXEnwzWJWgdX6LM56HMGGpUHwvQK15FGt7B75fE8dURmGmrK0FPpO/7eVNa7hqh0Q7axNmOYTDrXYDNDS/OhLqZMzrXqpeEJ+TxKXO+DcsCbKfhFPSMB8LmrGV9gGPWrylrVDZ+MPCCA8RYCWN3Zr2df7OQ5vlfQz+/ojMvEt0erCDkqpdQaTd8vt/UYNF3x+AevKYFzdfqkTDn9RprwNucIX/YeoulsrDZ+6GgY2Wl5SDClvVshPQ20T6QufNNQZukg/6r1lWn9Gnc1ymHLe49vq7AWejDbffa X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046);SRVR:DB4PR07MB393;BCL:0;PCL:0;RULEID:;SRVR:DB4PR07MB393; X-Microsoft-Exchange-Diagnostics: 1;DB4PR07MB393;4:VXXS+0jwc6rKPtFMKW3Kl/Y2tXbVOkFOvBCwHouyyHAGluQLxQOUoVgD6pFJbxpfIsOAc6quF4G3HkkjKnctmnL/VHppnHpHu/svN6YsG8b7zy+zNvC2dVsZLUwvnbT+74xRXGgu98xiAD8KB32CzSNVRSvtkZMPkFpWi9u3F7HTr/m9MkmCVmYbb15iv2i3XRn8IK6k1MdZMhHYjLAeASBK4MJJ/RpTqvQAB01aJL+dIIURYACnNAFv0PW1Ah3Z90dORWFTnE0735w0qsAP0IWZa3R0CTQn7FMMsvp9mFbNGtE/jszwfe4ICHY4TXNtdn1STbBZAr3gQ6WcPjALXmvC24rvPsJDXQ+8gcM1Vv0VbAchnRt0SW8z7x6VcBU03Jach6MqPuiQnLjFzh3WsA== X-Forefront-PRVS: 0066D63CE6 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6049001)(6009001)(7916002)(189002)(377454003)(377424004)(199003)(24454002)(54534003)(5660300001)(19580405001)(19580395003)(31696002)(42186005)(86362001)(33646002)(105586002)(31686004)(8676002)(5001770100001)(77096005)(97736004)(189998001)(36756003)(2950100001)(230700001)(107886002)(4001350100001)(586003)(2906002)(65826007)(81156014)(3846002)(68736007)(92566002)(6116002)(64126003)(50466002)(81166006)(50986999)(47776003)(54356999)(76176999)(7846002)(65956001)(83506001)(65806001)(23746002)(106356001)(305945005)(101416001)(7736002)(66066001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB4PR07MB393;H:[142.133.110.144];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DB4PR07MB393;23:Ha91FOQR8lNRvETTANKtKDCt4B/RTGRwMmEgwh?= =?Windows-1252?Q?0RTRWaY27GjMiMNgNnIuEorwYc5vM3ANNCHS8Wdivh5T1bDVupc6v684?= =?Windows-1252?Q?7sx8a03oDmqwaanjTMrYOxtlEeW9rBFGhkZD9Kw4/yfghnpo8r+cKg6d?= =?Windows-1252?Q?bWN7GdwmfQ8bUwpE6iRu4bRRPJzSByaueGMmVb+Tu8SdDRdcDuXjU2eD?= =?Windows-1252?Q?lZjbWt8tEbUpy8IgUdS1ZW2w6IVO5C1Y3zjWLwg5TdJFtyawJiitLJUC?= =?Windows-1252?Q?Z7wsG4WYI6V2UWAi0RMEY4FMISy2eyehNLcprUk3JsizB/+ymkZBTs2S?= =?Windows-1252?Q?WG8afTFlccF8f7PXXrUTEYykXEPmjHVLpRhwOXtVl+YerdthYhdd/kM5?= =?Windows-1252?Q?ZKlKmUAfvcE3RIsBwDeOrafVSz8NhdvvkaspSe2f2bVOv9QAxDCSutHP?= =?Windows-1252?Q?utw1bqsbn/lnxTo4LCS+v0/tJV4wyFjhTs6foeYROplAXRltYQ0aT6xK?= =?Windows-1252?Q?7UxL8Jb9IldgrHxGI56xYCwYwEUGYR0dtocyHBTPv/jUxYLJpdcTzSLt?= =?Windows-1252?Q?Pg1QMB0R+uBop5Af3FoBq1PyDnKlVRHmiMcYrOFsDV9bGKStU8E9A40P?= =?Windows-1252?Q?gCk4cNxxlSEZktgiiq7uaShkNdjCDrOVkZN4wA469tcFToudGE+yyofz?= =?Windows-1252?Q?+EZZfecyV77FHtvFmwfSlsKoX6g09mEssI0uhYv9DHsXfiHtaKV0BxQZ?= =?Windows-1252?Q?r2jPwJgtaHfBMbpzInlpX2OBTt5riTFRtCjbF074Lsde8kQPGJxnj/RM?= =?Windows-1252?Q?OA0ainIdXVj7q6jb40Od4yGtXHRM8HUeddcNBIe3mvbMKvj6yXMr1TvV?= =?Windows-1252?Q?hGs/0nWzA/q/LbdKBHUGjv5mNjhkNn8Mu5xP1QP5M6xImz4yxKlTRBrV?= =?Windows-1252?Q?I9HUzli8EjMOcL0RFiXxjWbMxkvBnAE0eyCNJNRaO4Mx07L/MtC6564d?= =?Windows-1252?Q?iwUUI5M4EY1op1ERkLjZVq1zGF2+TizwN+EXhcCdkR+1bR1zJepArq3z?= =?Windows-1252?Q?+Z4kz9vtWvD4bfiC4Tzn92kPygA2YwgQ4za19OtrdPYk/tt0xNMnY/Mf?= =?Windows-1252?Q?LMxWEiwxv2OPDSiK1H76kFtTwBpGLlErQbRklc3KqCjBzXL2vk0/v/Z4?= =?Windows-1252?Q?9wD1cAGCx/Zw0QXscdEdK57G1YBeQel5eDlAbyRLj91laCXaazWgFZV4?= =?Windows-1252?Q?3oPinyoFEkmYpEKvlFlopsUlhCD2CJgmT+qToXbn5PunkIbEzmbUmn7m?= =?Windows-1252?Q?zXP3ifqZA8TSvTXhIoP/FdFnICnBZyeYd+nfCdrVAe2/XaHHsWQVN0mL?= =?Windows-1252?Q?DCrvkpbfUGnSS8T3wPOdznEabWXDgHhN0xbK0hwifxIECd1jDTKG9/55?= =?Windows-1252?Q?JUMpLHEG/t6cPHcHjK9q1H8YgZ/CF99Kls1YzQlg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB4PR07MB393;6:0a22oVYpI2BSOb4oapNxUHMbM9lFqnJvTUzpkqrwZf/HWLF0CypzURfWtx6geuyLeDpojSPe146QseYbO697aJdTjTggNFE3RwJ91rgPKIttgPSfOnOeirqbSS0rQqWCcTMWZy7u0WNGRuaBPUJSep+/1jaFMkgs8UaJiGHGDMTgciUv1FcGkpXAAtRkMwtonXEQ9ulKMguoBj0eo2uDCdZjJUrC5rBoqXVCZyNkuVoNbYcgDbLmoyZM66yNTV5A0emVGF4PLPzGGuUKFmJpTiHb9V8cFEDPFpXuVsOJAh8=;5:Exfh2HsxTV+wi2GRzqVY9QzNNRkWgps0SwXXQvkkiLqcRmshf7V3RRUKtORqUd5z3SlP604MxToyEFr0etnDKF9I3sIJ5xw86SIlIwbOldnlcSrI/NDhBibVF/XWP7MwdCcVkxyFSKahcupYDmJ+0A==;24:aqnK5tTjVrj+Imoo3BO+vt7ZVpjYX35oMATPxAAqoBVPb+OLSOKkTXKdau8S2phOhXdqjcPGq+bVSBYU+KFOgwKM+dsgNQ5VuVJ3F23beaY=;7:NKOQfiZIf3Mhya0aXML8siWnzin5LxjljniHjDP4xZTeq7eGRYTIvRQsP8lkR8c0hRhdkQDjAD3u/sXszd/ad8LpJpwCmu3dF3dEha8yNVwmaZyKeXfdvmyAFgzU6ndhLXPmtBWvU7W4xCK81oU6B4/FjqyLcG6X3GsXa9ingY7lS6HELlv7MhVO5oC/i3+p8Z01VgJKv86vq8wS5ux1IbhZ8ptLT3Beys5wJSsYQ8v7BNnOlXvWQyWXwrLoOeae SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2016 17:47:03.1632 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB4PR07MB393 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes X-SW-Source: 2016-09/txt/msg00169.txt.bz2 On 16-09-15 12:52 PM, Pedro Alves wrote: > Otherwise including or some other C++ header is broken. > E.g.: > > In file included from /opt/gcc/include/c++/7.0.0/bits/char_traits.h:39:0, > from /opt/gcc/include/c++/7.0.0/string:40, > from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/infrun.c:68: > /opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:243:56: error: macro "min" passed 3 arguments, but takes just 2 > min(const _Tp& __a, const _Tp& __b, _Compare __comp) > ^ > /opt/gcc/include/c++/7.0.0/bits/stl_algobase.h:265:56: error: macro "max" passed 3 arguments, but takes just 2 > max(const _Tp& __a, const _Tp& __b, _Compare __comp) > ^ > In file included from .../src/gdb/infrun.c:21:0: > > To the best of my grepping abilities, I believe I adjusted all min/max > calls. If you missed one in the code you compile, it would show up as a compilation error. For the rest (native files?), if you missed one it will be an easy fix. There are a few places where it makes the lines too long. I personally don't mind, since I finally upgraded to a terminal wider than 80 characters, but it shouldn't be too long to fix. If you don't have your own already, may I suggest using this command line to find long lines? $ git show | sed "s|\t| |g" | sed -r 's|^\+(.{81,1000})|+\1 TOO LONG|g' | less It displays "TOO LONG" at the end of the line when an added line overflows 80 chars. > gdb/ChangeLog: > 2016-09-15 Pedro Alves > > * defs.h (min, max): Delete. > * aarch64-tdep.c: Include and use std::min and algorigthm -> algorithm. > std::max throughout. > * aarch64-tdep.c: Likewise. > * alpha-tdep.c: Likewise. > * amd64-tdep.c: Likewise. > * amd64-windows-tdep.c: Likewise. > * arm-tdep.c: Likewise. > * avr-tdep.c: Likewise. > * breakpoint.c: Likewise. > * btrace.c: Likewise. > * ctf.c: Likewise. > * disasm.c: Likewise. > * doublest.c: Likewise. > * dwarf2loc.c: Likewise. > * dwarf2read.c: Likewise. > * environ.c: Likewise. > * exec.c: Likewise. > * f-exp.y: Likewise. > * findcmd.c: Likewise. > * ft32-tdep.c: Likewise. > * gcore.c: Likewise. > * hppa-tdep.c: Likewise. > * i386-darwin-tdep.c: Likewise. > * i386-tdep.c: Likewise. > * linux-thread-db.c: Likewise. > * lm32-tdep.c: Likewise. > * m32r-tdep.c: Likewise. > * m88k-tdep.c: Likewise. > * memrange.c: Likewise. > * minidebug.c: Likewise. > * mips-tdep.c: Likewise. > * moxie-tdep.c: Likewise. > * nds32-tdep.c: Likewise. > * nios2-tdep.c: Likewise. > * nto-procfs.c: Likewise. > * parse.c: Likewise. > * ppc-sysv-tdep.c: Likewise. > * probe.c: Likewise. > * record-btrace.c: Likewise. > * remote.c: Likewise. > * rs6000-tdep.c: Likewise. > * rx-tdep.c: Likewise. > * s390-linux-nat.c: Likewise. > * s390-linux-tdep.c: Likewise. > * ser-tcp.c: Likewise. > * sh-tdep.c: Likewise. > * sh64-tdep.c: Likewise. > * source.c: Likewise. > * sparc-tdep.c: Likewise. > * symfile.c: Likewise. > * target-memory.c: Likewise. > * target.c: Likewise. > * tic6x-tdep.c: Likewise. > * tilegx-tdep.c: Likewise. > * tracefile-tfile.c: Likewise. > * tracepoint.c: Likewise. > * valprint.c: Likewise. > * value.c: Likewise. > * xtensa-tdep.c: Likewise. > * cli/cli-cmds.c: Likewise. > * compile/compile-object-load.c: Likewise. I noticed that you didn't list all affected functions in your ChangeLog, only the files. I think it makes sense for those across-the-board changes, I'll probably do the same some day :).