From nobody Mon Feb 9 12:25:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+95965+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95965+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1667593539; cv=none; d=zohomail.com; s=zohoarc; b=UE4s7UzED4FoSJZLMOzEeLyZd46wlkn7iOORkfSfbqICBl6TLQTMUyIWq4Z+jMHurp5W73hF0HNGQfT1kS0w14AzBrDdjLhfrdfEjAVYPHQlp7jUGN9XOJ9w60XyGH5dg2/LyMf89B9ZD/ic3RhVdOBJJd9SRtjQ9M2eEVaI7LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667593539; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=G88blHo0Blen+M7tTgz6rME4b/ke3uNeCDKB+KlFBm8=; b=kOBHc8ofwCMgSuildjAWeJ0UlVBOsQUk/cKm5dvDRAiZeycbXxAUjrD49yq3i3mqF6wrMSN980wPl7sdM2Q0o2r9o9+A3ED6OsH/lD5OtId1IqPct7LcDMsIpQofEs6YIj53ItMBY4OabMAhyBrXRf0SE5YTRrbsrDSXZpUXkbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95965+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1667593539412290.6489438782389; Fri, 4 Nov 2022 13:25:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id A5d3YY1788612xqon8koFFyq; Fri, 04 Nov 2022 13:25:39 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.2518.1667593537052236213 for ; Fri, 04 Nov 2022 13:25:37 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="396363606" X-IronPort-AV: E=Sophos;i="5.96,138,1665471600"; d="scan'208";a="396363606" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2022 13:25:37 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10521"; a="777839148" X-IronPort-AV: E=Sophos;i="5.96,138,1665471600"; d="scan'208";a="777839148" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.255.31]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2022 13:25:36 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch V2 1/7] MdePkg/Include: Update Base.h to improve C++ compatibility Date: Fri, 4 Nov 2022 13:25:22 -0700 Message-Id: <20221104202528.1157-2-michael.d.kinney@intel.com> In-Reply-To: <20221104202528.1157-1-michael.d.kinney@intel.com> References: <20221104202528.1157-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: clFoCyrwwbsh7vmUmltQhqhOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667593539; bh=/tKE1PRML23s9LTDe86zYLpOfEiKdfAA+LPV3+UH15E=; h=Cc:Date:From:Reply-To:Subject:To; b=cCSvn1TBMIYFdXj7BjJIGJsop4CbmROZphtjAZQXhZYclWaNzIomm8kw1tHJNiTiQh5 qNYgZldpKz7T1OZJxzngZtfZb8PUi+fRrq7jnlCItt1JBujh6fLCqhOLR7wCe/2qfVif/ DewnrJLR14H0QzF4zhaT4m1h2vf05kgCy2A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667593541317100009 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4134 * Map NULL to nullptr or __null when c++ compiler is used. * Map STATIC_ASSERT to static_assert when a c++ compiler is used. * Typecast RETURN_SUCCESS to type RETURN_STATUS to match type used by all return error/warning status codes. C++ has stricter type checking and found this inconsistency. Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao --- MdePkg/Include/Base.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index d19ddfe4bba7..d209e6de280a 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -309,7 +309,15 @@ struct _LIST_ENTRY { /// /// NULL pointer (VOID *) /// +#if defined (__cplusplus) + #if defined (_MSC_EXTENSIONS) +#define NULL nullptr + #else +#define NULL __null + #endif +#else #define NULL ((VOID *) 0) +#endif =20 // // Null character @@ -760,7 +768,7 @@ typedef UINTN *BASE_LIST; **/ #ifdef MDE_CPU_EBC #define STATIC_ASSERT(Expression, Message) -#elif defined (_MSC_EXTENSIONS) +#elif defined (_MSC_EXTENSIONS) || defined (__cplusplus) #define STATIC_ASSERT static_assert #else #define STATIC_ASSERT _Static_assert @@ -959,7 +967,7 @@ typedef UINTN RETURN_STATUS; /// /// The operation completed successfully. /// -#define RETURN_SUCCESS 0 +#define RETURN_SUCCESS (RETURN_STATUS)(0) =20 /// /// The image failed to load. --=20 2.37.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95965): https://edk2.groups.io/g/devel/message/95965 Mute This Topic: https://groups.io/mt/94814639/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-