From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.8068.1685448623118467802 for ; Tue, 30 May 2023 05:10:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gmail.com header.s=20221208 header.b=nXr1cAsi; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: pedro.falcato@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1b0424c5137so17687065ad.1 for ; Tue, 30 May 2023 05:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685448622; x=1688040622; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ZPrtLWFHpnF6NevyyLsjwtibDbel7PmrHsXZ44cZiio=; b=nXr1cAsiDbcrID/6HMpdzubMkipOktftVoHroWjdoxEMDRM1ZQVcpWKLoO4YSUlfFs 6ZwQGjznVDEIdWy1V+eriOHXWvyAKoQ3FXHWCYlww28uHWXYlMsuWr3K/xi/gnGzkAXy FCuO8zTeuPHXoY4NKECjaagrtovgHHCBMynuv43QWdVyl87FfIJki3ZmuOQ9Mgqp+tii H7m4PzdW4YCPKNyloHBlb34yAqVlg4fuEkZqBzR13+UOvrtnHMNd26Jya8rqR7VxBvyR WHbkJ1Nx5+jb9alm5gISKIRspeYWuQ0GPldsQP3UAQDKvzN9WXuPdlKub8c2/uvJ15HP WXmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685448622; x=1688040622; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZPrtLWFHpnF6NevyyLsjwtibDbel7PmrHsXZ44cZiio=; b=J2LLrM0/225diiPNF5nr6lpiiknB0yhFMt7KNpSl5WWtU7rX9fec81/RYS2qN7G++j zwunjDiaJgcjq3vV0sFLTqhzlnnK3qYNMXpLvw8kxsQVUKp6dj9Dx2tiUdwybti2d4oa uJioYM8WZCW0rMJJByQaJO1pD2utMRtWOtrmSrmmmkHNk1euuvEnOvEGCf4NLneueTS3 P3w0V3CYYg3AixaQ1FwiZP9JiENheIiS7kCP/6Z6+Pjp9sL/RCt0rKjbSl6WFl6Wibbd Q8m6V5UfJ999REwyFYSiFC3Ex2AT3PYYni7LL20iSQ/ZwXZpl9Zx66fAD0UE2n/IgmjV qITA== X-Gm-Message-State: AC+VfDy5XO1CIDrnqT3IrER9N1YUM6/LXHWHHfWYFdceZ8QX5nJ9QbqO jT5mgq/+jqTZg4lk8J2YHLXcJ6bR90GG3+HiqFk= X-Google-Smtp-Source: ACHHUZ5zaF+8uiZWWQNajp5kYK1p1U6Xy7uS6RxrZ7oRlj0cR+pkloa7tDRE6UmkmxzPweuo0X8V+UXui+MMrIrVd74= X-Received: by 2002:a17:902:c94a:b0:1a6:8ed5:428a with SMTP id i10-20020a170902c94a00b001a68ed5428amr2658525pla.22.1685448622586; Tue, 30 May 2023 05:10:22 -0700 (PDT) MIME-Version: 1.0 References: <20230529170649.1506-1-michael.d.kinney@intel.com> In-Reply-To: <20230529170649.1506-1-michael.d.kinney@intel.com> From: "Pedro Falcato" Date: Tue, 30 May 2023 13:10:11 +0100 Message-ID: Subject: Re: [Patch 0/2] Address C++ keyword collisions To: Michael D Kinney Cc: devel@edk2.groups.io, Liming Gao , Zhiguang Liu , Oliver Smith-Denny , Aaron Pop Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, May 29, 2023 at 6:06=E2=80=AFPM Michael D Kinney wrote: > > 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 > For the series: Reviewed-by: Pedro Falcato Make sure you squash these two commits into one, as to not break bisectabil= ity. --=20 Pedro