More github cleanup

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

Code/Framework/GridMate/Platform/Android/GridMate/Session/LANSession_Android.cpp

@@ -6,19 +6,18 @@
  *
  */
 
-#include <GridMate/String/string.h>
 #include <unistd.h>
 
 namespace GridMate
 {
     namespace Platform
     {
-        void AssignExtendedName(GridMate::string& extendedName)
+        void AssignExtendedName(AZStd::string& extendedName)
         {
             char hostName[64];
             gethostname(hostName, AZ_ARRAY_SIZE(hostName));
 
-            extendedName = GridMate::string::format("%s", hostName);
+            extendedName = AZStd::string::format("%s", hostName);
         }
     }
 }

Code/Framework/GridMate/Platform/Common/UnixLike/GridMate/Carrier/Utils_UnixLike.cpp

@@ -18,9 +18,9 @@
 
 namespace GridMate
 {
-    string Utils::GetMachineAddress(int familyType)
+    AZStd::string Utils::GetMachineAddress(int familyType)
     {
-        string machineName;
+        AZStd::string machineName;
 
         struct ifaddrs* ifAddrStruct = nullptr;
         struct ifaddrs* ifa = nullptr;

Code/Framework/GridMate/Platform/Common/WinAPI/GridMate/Carrier/Utils_WinAPI.cpp

@@ -16,9 +16,9 @@
 
 namespace GridMate
 {
-    string Utils::GetMachineAddress(int familyType)
+    AZStd::string Utils::GetMachineAddress(int familyType)
     {
-        string machineName;
+        AZStd::string machineName;
         char name[MAX_PATH];
         int result = gethostname(name, sizeof(name));
         AZ_Error("GridMate", result == 0, "Failed in gethostname with result=%d, WSAGetLastError=%d!", result, WSAGetLastError());

Code/Framework/GridMate/Platform/Linux/GridMate/Session/LANSession_Linux.cpp

@@ -6,19 +6,18 @@
  *
  */
 
-#include <GridMate/String/string.h>
 #include <unistd.h>
 
 namespace GridMate
 {
     namespace Platform
     {
-        void AssignExtendedName(GridMate::string& extendedName)
+        void AssignExtendedName(AZStd::string& extendedName)
         {
             char hostName[64];
             gethostname(hostName, AZ_ARRAY_SIZE(hostName));
 
-            extendedName = GridMate::string::format("%s", hostName);
+            extendedName = AZStd::string::format("%s", hostName);
         }
     }
 }

Code/Framework/GridMate/Platform/Linux/GridMate/String/StringUtils_Platform.h

@@ -1,8 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once

Code/Framework/GridMate/Platform/Mac/GridMate/Session/LANSession_Mac.cpp

@@ -6,19 +6,18 @@
  *
  */
 
-#include <GridMate/String/string.h>
 #include <unistd.h>
 
 namespace GridMate
 {
     namespace Platform
     {
-        void AssignExtendedName(GridMate::string& extendedName)
+        void AssignExtendedName(AZStd::string& extendedName)
         {
             char hostName[64];
             gethostname(hostName, AZ_ARRAY_SIZE(hostName));
 
-            extendedName = GridMate::string::format("%s", hostName);
+            extendedName = AZStd::string::format("%s", hostName);
         }
     }
 }

Code/Framework/GridMate/Platform/Windows/GridMate/Session/LANSession_Windows.cpp

@@ -6,15 +6,15 @@
  *
  */
 
-#include <GridMate/String/string.h>
 #include <WinSock2.h>
 #include <stdlib.h>
+#include <AzCore/std/string/conversions.h>
 
 namespace GridMate
 {
     namespace Platform
     {
-        void AssignExtendedName(GridMate::string& extendedName)
+        void AssignExtendedName(AZStd::string& extendedName)
         {
             char hostName[64];
             gethostname(hostName, AZ_ARRAY_SIZE(hostName));
@@ -31,7 +31,7 @@ namespace GridMate
                 azsnprintf(procName, AZ_ARRAY_SIZE(procName), "Unknown");
             }
 
-            extendedName = GridMate::string::format("%s::%s", hostName, procName);
+            extendedName = AZStd::string::format("%s::%s", hostName, procName);
         }
     }
 }

Code/Framework/GridMate/Platform/iOS/GridMate/Session/LANSession_iOS.cpp

@@ -6,19 +6,18 @@
  *
  */
 
-#include <GridMate/String/string.h>
 #include <unistd.h>
 
 namespace GridMate
 {
     namespace Platform
     {
-        void AssignExtendedName(GridMate::string& extendedName)
+        void AssignExtendedName(AZStd::string& extendedName)
         {
             char hostName[64];
             gethostname(hostName, AZ_ARRAY_SIZE(hostName));
 
-            extendedName = GridMate::string::format("%s", hostName);
+            extendedName = AZStd::string::format("%s", hostName);
         }
     }
 }