From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.1947.1685491527327947968 for ; Tue, 30 May 2023 17:05:27 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=MmD4JuQk; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: jiewen.yao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685491527; x=1717027527; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=fGmiZRRy3WiKM//5Iag8XBh5VnYytQBcDAJXbLQiFD0=; b=MmD4JuQkU1YD71N55NEjqjKKL7h7RIKuYFodJ2+m+yVBGqH4IArdtp0u lMtzxKCE35dj85RAZ5zOGzk73XxScfn9FuniYzdxUgz2yQiOBXoBgu/oz MnS4LA9dj+JFpvnX5jXUVEk4ZXpFkqH9O8LBXZsd6mTnoC/2R+KSWnRJE RhHHho3YTL06JQ/RxAwDbE6wJ1vreHvKrtcQE1EC/BSX8tn95YQbGWSBF LSagVEO1JyFKMeFHGLQRHGJNzxPFMee/b/KuDzPbFFJ6kWqYnlDcFUp8m 01V4Vs5ks3L1kNZBMSDrRgi43htGkCuORuH0NMYWFBQ5urZR6OiK+Da/E w==; X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="352581269" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="352581269" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 17:05:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="706646131" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="706646131" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga002.jf.intel.com with ESMTP; 30 May 2023 17:05:26 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 30 May 2023 17:05:26 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 30 May 2023 17:05:25 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Tue, 30 May 2023 17:05:25 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.106) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Tue, 30 May 2023 17:05:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I1dUiPozef1mTDlm/yJrX4cGv3RJa7MFFD1lY55SNF1oBYk89ESCTvX6u8Ak11wcYQHfSa8iPZvbRrroZt8KC0VN5BlcWrwUswGimkWtqq2IoXDzA4dFgJ49Q1Mh3U/rXqcXXxXpT1w8R9jP8saPl/heZsaixWO259NvAY3Fw37ib8ifPno9eccWVSJixU16KMHsiIU4tGS3Dp7j+vYr8JR8mtQQDl/yzbfJeS0bFog70oAGd6AvByfgtrfjiqV8Lw3OQPtxXZQwnCXxgm92d8/NmsJbEyGcBVSPUllvpu4M0/83C1jgp7XmzJXS4dhLLn0jQR+vdcTWoFqRmA+DFw== 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=G31hzoWlIH/wYnFsmjRCHynZWHmWNPaCZOPPcYziQYs=; b=Q+Hg/p3z5pvdXNXS9/eqiiW/jEkKtNKckW78/KkZU/Qw7ueFlNui60pdQw938oTSQ7WxeBI8K0xjQ8Y7LnJw+g4xLiGCq7qrlKzIU6qwzl0McXH+aTcLOxIz4MwCj65l/ABBxTgMs9avSGKP/2qtblNORuEDJWOWwC7y6JC2E+6xNuIP5tvGV067usER8wgi74BZ9TemtEZiTOTOx7zz9bQjHYeZeseFKaljeskefu89B6F4bPL6nZQpBhx8GFfd0r/g4j57dxJ1Fu5KSUvEHiH7mB11tRzocMEKd619TpB+tfLOg/xesdPlmVG/iIDu4LHihDCJ+fE2wFuuq/hnAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from PH0PR11MB5879.namprd11.prod.outlook.com (2603:10b6:510:142::5) by DM4PR11MB7349.namprd11.prod.outlook.com (2603:10b6:8:106::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23; Wed, 31 May 2023 00:05:16 +0000 Received: from PH0PR11MB5879.namprd11.prod.outlook.com ([fe80::28b1:8a7f:9236:ff41]) by PH0PR11MB5879.namprd11.prod.outlook.com ([fe80::28b1:8a7f:9236:ff41%3]) with mapi id 15.20.6433.020; Wed, 31 May 2023 00:05:15 +0000 From: "Yao, Jiewen" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Gao, Liming" , "Liu, Zhiguang" , Oliver Smith-Denny , Pedro Falcato , "Pop, Aaron" Subject: Re: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions Thread-Topic: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions Thread-Index: AQHZkygOALddym/94EWLZvswf8EmZq9zgGLg Date: Wed, 31 May 2023 00:05:15 +0000 Message-ID: References: <20230530185322.70-1-michael.d.kinney@intel.com> In-Reply-To: <20230530185322.70-1-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH0PR11MB5879:EE_|DM4PR11MB7349:EE_ x-ms-office365-filtering-correlation-id: 5bc74cda-8291-4a8f-fe4c-08db616ab667 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: BSxFMWtA62GhDG/GleLCyc2+nQD+A60FDlcfJqqDg9sxuT3dlZS0+5lxcye8GWgKADTLMOH0+6fCK02m8PADenIp3Z45twd600wMOmWewahCCeQCueObiMqbb6tiIkpGs7P4JJqRBwIxp+tKwX84WiNKRHkn3oqa2fS85r7YPXLGD2NQnDMIxmqCUlBxAxxbQlsg0aConKn3b4eVq/13mj2z2Ql2CyyMTQsfz3QdNyvIb9+SuTnpVRcaA4Zcy1DUayvtSF1l4EZ0+44XE3/0j1CQ04Fy2qIs/M5YEnqOOk66eCQJTuDmf4RNREoj7zLH/IsJs8EsF4XC+7lxYG5Jn/0ofLT7ZDGAAIB2TY7NCLjjaeUVCigzVAsIrx0f9pIlDmQooIKYVH5IdF2eobemFRFNG7hAIlhFMDHx3ud2upExY1kzLSxMT06hkKTwAEy9yX4qC2vTjE8OJAszIBeKwdwMlN0e+m6Y3fU/WGnnv2bd0LYI35vUVIzrNI/h1kSkE0O33shjvqWzghQovD5A8VO/s/0e96KL3q6zREArtXbo3TEsJ5Pr/X7W/aUChixiLYDJWT6KcbsiTCJZNbLVQVrm0MzUQnzclpmDLV7J53hD6izzdRM/aPAJiYcpu3u4LyGN9S19wVGFUV9YA5WIWA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB5879.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(346002)(136003)(396003)(39860400002)(376002)(451199021)(71200400001)(66899021)(478600001)(19627235002)(54906003)(110136005)(8676002)(8936002)(52536014)(5660300002)(33656002)(86362001)(2906002)(38070700005)(122000001)(64756008)(66476007)(66556008)(66946007)(66446008)(6636002)(76116006)(82960400001)(316002)(4326008)(55016003)(38100700002)(41300700001)(83380400001)(6506007)(53546011)(186003)(9686003)(966005)(7696005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?KiESFu5Dbsw8Xlh6Twdj67LZ4+yRvIFITi6UAMrTBGDzUHJUQ6kbdS5hdqsV?= =?us-ascii?Q?j9DkN45z03UpnZ+bUCrRrPJCYXnAdO6mn9q1ugz41ctctLC8WqU3Efd+eq58?= =?us-ascii?Q?vmIxgarKimIF0rOAT5ITNnSsVY2+y7mOfQNqdsj+Sg0S8ohnxtW05PPyRCrj?= =?us-ascii?Q?yytjx5r48WcViw51HKlGyBk0KWFuBSbGiMEjrPOnpGjaB89Whq/KAC1lt5rA?= =?us-ascii?Q?jkHEEs0ihYp8VpAUx373l1OEA2ezIP9IRhJAN8C7EUB6/xybbQXL4zHRR2Re?= =?us-ascii?Q?iapeT9VwOTh2uX2voKol+cglaWGYNI+YvHtkiDWxXGn2kG68cFv/vNJq9mN3?= =?us-ascii?Q?VNF+RyPZ7Wq5xtgfEo6BYxtw++IQD6R8hkeyiCq2FRmEdVdtMnHanb/v9atB?= =?us-ascii?Q?NMBVwwocGLkf6HttMbYsacsqHJtugRIga0EvYpBmguPXowsB/1kjaitayQAy?= =?us-ascii?Q?QH28V5V3jZNVO199YUZW11X1I22oek4mxWKoZO1XcVojkWcJAagris1wuJPY?= =?us-ascii?Q?+9On78nm8q6nd1J0hauGkgoxp4SjZYDrHG0nyk/lCEF/7UszQXDTicoGWvmv?= =?us-ascii?Q?6rFISFKOKj+EjiG37Zz8nAVRBxebFsL5bE7kAZVUXnUjgfeXMcLF2UYGKOXK?= =?us-ascii?Q?DCTeUB0zSt6t9oRQkG/pCLwas1I+aFhNrlnAMPfUrtujsbu76xSNpcgZdaSu?= =?us-ascii?Q?a+ksHWdezjcivJAdHSGx7c1kC3pXIg1VSBpbbKN7sFAGIEynEO6+125zSL2L?= =?us-ascii?Q?mcC/ty2SRsMC6YB5ceY18xewfQcwEbVh6HbUzrHLSsFy8wZ9KiO5Y66ldI9E?= =?us-ascii?Q?/HwJCsPjNiRB4CniizYFkrcD7NHIecKBzZviFPEA8TEHV6mlqOwh2r7MSSt0?= =?us-ascii?Q?AFkI3Y0AzWQYAmuJVayDNYfqWpxpDHaK2Cf2I1y4/0zn5pneqy0KvnNA4bF5?= =?us-ascii?Q?wXQ0p7MYmkqt/VRunJujiCDbRof5oeyqDmpQ0hA8fa971ZtvajhkbtUJacWH?= =?us-ascii?Q?ywTQy7/777LFa/RgjbIEhVyDp4ooYhr41MKwhyP+9wHMB/9Ef4j0Pzb7yVr4?= =?us-ascii?Q?0/AX7nWECIm6GFgy4teF1c3tdGXdcGfsngPsXOnnJXx/EaEai4fpB/DLr1G+?= =?us-ascii?Q?LFG14H/yEl6jDpfsQpi3CWyvZOFa+KzrVR70aJHEEEqrgV8Eky5/ooL/Mzvy?= =?us-ascii?Q?xGTqTzaoQGa08yOd6Abg//T8voDMueq6fTCBSnTLj8Icj7A89oy50fopCTcU?= =?us-ascii?Q?1LxKWNxHNSXEMk/sbK/oFjhAl/MkHe/wFEGaavBiSY+ZINEIqj3OwaSSY6jc?= =?us-ascii?Q?Y6QItRRBX78cOpmK8R22KqAp7vXWcnHToz0+OvgLKNR0bR9Ruj7qBWjeahuz?= =?us-ascii?Q?TCtI+1w0hTI5/sZPrFhq2rAqq1LDI+1jrdKWdN077/b6wBpsdlM7j7Yec8y0?= =?us-ascii?Q?xqIaHgJTSNRBnf8AAuyR/rN6ZyNopPxBcRaUdQCCYul/PSX+fJJEZTL0Vepl?= =?us-ascii?Q?sK1NztutcEnLjCKhLau5hSwPq2CiUs/pigcq2j8DOnZ4TuLHyY9ByVPsHXD0?= =?us-ascii?Q?tfcT9oYEbH6wLh8Mf9g=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5879.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bc74cda-8291-4a8f-fe4c-08db616ab667 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 May 2023 00:05:15.7268 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: PBLWfataNaDDxmR5nUYSYp8p33KxnXtgwZ07hEJuwEqsXAaYNHL1drlMfLMLgWg2JvUuAUKMSp8EDltGGLy0Xg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7349 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen Yao Hi Mike Do you think if we can enhance CI to catch such keyword? I don't mean to need it in this patch, but something we could consider late= r. Thank you Yao, Jiewen > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Michael D > Kinney > Sent: Wednesday, May 31, 2023 2:53 AM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Liu, Zhiguang > ; Oliver Smith-Denny ; > Pedro Falcato ; Pop, Aaron > > Subject: [edk2-devel] [Patch v2 0/3] Address C++ keyword collisions >=20 > New in v2 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > Changes from 2 patches to 3 patches to support bisect. This > temporarily uses an anonymous union to allow use of both field > name styles. It also allows downstream usage of these fields > to sync with the first 2 patches, update their field names, > and then sync with last patch. >=20 > PR: https://github.com/tianocore/edk2/pull/4436 >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20 > Update Tpm12.h and Tpm20.h and not use c++ reserved keywords > operator and xor in C structures to support use of these > include files when building with a C++ compiler. >=20 > Update SecurityPkg Tpm2CommandLib to use updated field names. >=20 > * Change operator -> Operator > * Change xor -> Xor >=20 > NOTE: This is a non-backwards compatible change to Tpm12.h > and Tmp20.h. And consumers of these include files that access > the "operator" or "xor" fields must be updated. >=20 > Cc: Liming Gao > Cc: Zhiguang Liu > Cc: Oliver Smith-Denny > Cc: Pedro Falcato > Cc: Aaron Pop > Signed-off-by: Michael D Kinney >=20 > Michael D Kinney (3): > MdePkg/Include/IndustryStandard: Add Operator and Xor field names > SecurityPkg/Library/TpmCommandLib: Change xor to Xor > MdePkg/Include/IndustryStandard: Address C++ keyword collisions >=20 > MdePkg/Include/IndustryStandard/Tpm12.h | 4 ++-- > MdePkg/Include/IndustryStandard/Tpm20.h | 4 ++-- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Capability.c | 6 +++--- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Object.c | 6 +++--- > SecurityPkg/Library/Tpm2CommandLib/Tpm2Session.c | 2 +- > 5 files changed, 11 insertions(+), 11 deletions(-) >=20 > -- > 2.40.1.windows.1 >=20 >=20 >=20 >=20 >=20