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.54443.1685380014980465657 for ; Mon, 29 May 2023 10:06:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=KO80wwlQ; 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=1685380014; x=1716916014; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6RMYojWCjMX+GY8FdekMPCvp6yAPb52/yyxu6WIjYc0=; b=KO80wwlQVZcsY1w1gcJO2u2YN5sUcxjyoZWza1CdyICzP+iMm3g4GOFF kAkS6EBnT3TDUMr0zVJBoTfbAWt4GWZrL/wnnkrZValTq1KHxwtqWv/lj Y/60Ht6tUPCa/uAxwjfI0azJpotFH/OMCQBllTRJEP9d4y+lMxjdGwikc TijoC3fMFtG+Uj80AtVO3uE2cFeg+4AdFasLelmJZ+3gQVowHdV6zay0M MeNttDA0vSagyU/HMbW4EcKbyZn2GG28zfJwL+PXWpsrbRp1g90EzzTNF N1mJgET4jUg5jkck0XRDg2l27hqr0SXM5yzOnWjjbnTNmEBMmQt9qtp9m w==; X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="352246052" X-IronPort-AV: E=Sophos;i="6.00,201,1681196400"; d="scan'208";a="352246052" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2023 10:06:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10725"; a="709350932" X-IronPort-AV: E=Sophos;i="6.00,201,1681196400"; d="scan'208";a="709350932" Received: from mdkinney-mobl.amr.corp.intel.com ([10.209.9.14]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2023 10:06:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Oliver Smith-Denny , Pedro Falcato , Aaron Pop Subject: [Patch 0/2] Address C++ keyword collisions Date: Mon, 29 May 2023 10:06:47 -0700 Message-Id: <20230529170649.1506-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.40.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 (2): MdePkg/Include/IndustryStandard: Address C++ keyword collisions SecurityPkg/Library/TpmCommandLib: Change xor to Xor 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