Fix ICC build break.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8158 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
index d7b89d96c592ee80f6ffe35c4f48be608611d755..737aaf7315139dfea448f7f13f41eacfe00128c3 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
@@ -1083,7 +1083,7 @@ ParseOpCodes (
       //\r
       // The formset OpCode contains ClassGuid\r
       //\r
-      FormSet->NumberOfClassGuid = ((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3;\r
+      FormSet->NumberOfClassGuid = (UINT8) (((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3);\r
       CopyMem (FormSet->ClassGuid, OpCodeData + sizeof (EFI_IFR_FORM_SET), FormSet->NumberOfClassGuid * sizeof (EFI_GUID));\r
       break;\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 354aa3507fa84fc2ef96d813b08e44280124f21b..6425bea28c0d3b0ca099cc74e48d16a15d46abee 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -515,7 +515,7 @@ DisplayForm (
     }\r
 \r
     if (Statement->DisableExpression != NULL) {\r
-      Suppress = Suppress || Statement->DisableExpression->Result.Value.b;\r
+      Suppress = (BOOLEAN) (Suppress || Statement->DisableExpression->Result.Value.b);\r
     }\r
 \r
     if (!Suppress) {\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index b66b9e1e19c54a5af5763b8ba3833ab6ebcad9ec..0a067f03762ee8ae6dad5e4bc396ab862ff5ef32 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -2225,7 +2225,7 @@ GetIfrBinaryData (
             // Check ClassGuid of formset OpCode\r
             //\r
             IsSetupClassGuid  = FALSE;\r
-            NumberOfClassGuid = ((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3;\r
+            NumberOfClassGuid = (UINT8) (((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3);\r
             ClassGuid         = (EFI_GUID *) (OpCodeData + sizeof (EFI_IFR_FORM_SET));\r
             for (Index = 0; Index < NumberOfClassGuid; Index++) {\r
               if (CompareGuid (ClassGuid + Index, &gEfiHiiPlatformSetupFormsetGuid)) {\r