Gems/LyShine

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Code/Legacy/CryCommon/IMNM.h

@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include <CryCommon/BaseTypes.h>
+
 namespace MNM
 {
     namespace Constants
@@ -62,7 +64,7 @@ namespace MNM
         GlobalIslandID(const uint64 defaultValue = MNM::Constants::eGlobalIsland_InvalidIslandID)
             : id(defaultValue)
         {
-            STATIC_ASSERT(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
+            static_assert(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
         }
 
         GlobalIslandID(const uint32 navigationMeshID, const MNM::StaticIslandID islandID)

Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h

@@ -9,6 +9,7 @@
 #include <AzCore/Component/ComponentBus.h>
 #include <AzCore/Math/Vector2.h>
 #include <LyShine/Bus/UiTransformBus.h>
+#include <CryCommon/Cry_Color.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 class UiTransform2dInterface

Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h

@@ -428,26 +428,26 @@ inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedSize() const
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopLeft() const
 {
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::min(AZStd::min(AZStd::min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::min(AZStd::min(AZStd::min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopRight() const
 {
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::max(AZStd::max(AZStd::max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::min(AZStd::min(AZStd::min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomRight() const
 {
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::max(AZStd::max(AZStd::max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::max(AZStd::max(AZStd::max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomLeft() const
 {
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::min(AZStd::min(AZStd::min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::max(AZStd::max(AZStd::max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline void UiTransformInterface::RectPoints::SetAxisAligned(float left, float right, float top, float bottom)

Code/Legacy/CryCommon/LyShine/IDraw2d.h

@@ -9,6 +9,7 @@
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>
+#include <AzCore/std/string/string.h>
 
 // Forward declarations
 struct IFFont;