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.2491.1685472809773224682 for ; Tue, 30 May 2023 11:53:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=cSwzzHWL; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: michael.d.kinney@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685472809; x=1717008809; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=P9LPwWRKT8tZvjPbqHK9giuumpE8YjvwhF1MFSYmwK0=; b=cSwzzHWL3F+PHmMDPT2QzsBSbiuXNjzI8bNGsi3ySQcPmAo93sg6GN0h ocrlnqXVVHuHtSYgYGdSMTUtl6AgsaW768RQU6ZuvnulclhFjaCOCkzbE 5szvToUT+AyR0MPPK/1La+Dc2J3Q/E1AIr11qzn1LaF7SxQPkSDEO8GO7 IuN/UrV8Hx0M1VTN/hteAPWoyvoSSzIdqsZzzl99i5tKzQySLVlqBWP0l lpixdUd1mipR1abImTvdzg58tx1XD8pbuxX5UvXvQbkNF7uVZAoP+eXNH 1xJTFT+LRdNTmBsMW04ml0hN/JMoNOkOl8rsbnlxUgSV6ScefCwJ3HLg/ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="352514911" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="352514911" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 11:53:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="771675329" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="771675329" Received: from unknown (HELO mdkinney-mobl.amr.corp.intel.com) ([10.241.111.19]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 11:53:28 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Oliver Smith-Denny , Pedro Falcato , Aaron Pop Subject: [Patch v2 0/3] Address C++ keyword collisions Date: Tue, 30 May 2023 11:53:19 -0700 Message-Id: <20230530185322.70-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.40.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit New in v2 ========== 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. PR: https://github.com/tianocore/edk2/pull/4436 =========== 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. Update SecurityPkg Tpm2CommandLib to use updated field names. * Change operator -> Operator * Change xor -> Xor 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. Cc: Liming Gao Cc: Zhiguang Liu Cc: Oliver Smith-Denny Cc: Pedro Falcato Cc: Aaron Pop Signed-off-by: Michael D Kinney 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 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(-) -- 2.40.1.windows.1