linux fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -543,7 +543,7 @@ GridHubComponent::OnMemberJoined([[maybe_unused]] GridMate::GridSession* session
|
||||
case AZ::PlatformID::PLATFORM_WINDOWS_64:
|
||||
case AZ::PlatformID::PLATFORM_APPLE_MAC:
|
||||
{
|
||||
GridMate::string localMachineName = GridMate::Utils::GetMachineAddress();
|
||||
AZStd::string localMachineName = GridMate::Utils::GetMachineAddress();
|
||||
if( member->GetMachineName() == localMachineName )
|
||||
{
|
||||
ExternalProcessMonitor mi;
|
||||
@@ -629,7 +629,7 @@ bool GridHubComponent::StartSession(bool isRestarting)
|
||||
AZ_Assert(GridMate::HasGridMateService<GridMate::LANSessionService>(m_gridMate), "Failed to start multiplayer service for LAN!");
|
||||
|
||||
// if we get an address 169.X.X.X (AZCP is NOT ready) or 127.0.0.1 when network is not ready
|
||||
GridMate::string machineIP = GridMate::Utils::GetMachineAddress();
|
||||
AZStd::string machineIP = GridMate::Utils::GetMachineAddress();
|
||||
if( machineIP == "127.0.0.1" || machineIP.compare(0,4,"169.") == 0 )
|
||||
{
|
||||
AZ_Warning("GridHub", false, "\nCurrent IP %s might be invalid.\n",machineIP.c_str());
|
||||
|
||||
@@ -141,7 +141,7 @@ public:
|
||||
/// Callback that notifies the title when a session will be left. session pointer is NOT valid after the callback returns.
|
||||
void OnSessionDelete(GridMate::GridSession* session) override;
|
||||
/// Called when a session error occurs.
|
||||
void OnSessionError(GridMate::GridSession* session, const GridMate::string& errorMsg ) { (void)session; (void)errorMsg; }
|
||||
void OnSessionError(GridMate::GridSession* session, const AZStd::string& errorMsg ) { (void)session; (void)errorMsg; }
|
||||
/// Called when the actual game(match) starts
|
||||
void OnSessionStart(GridMate::GridSession* session) { (void)session; }
|
||||
/// Called when the actual game(match) ends
|
||||
|
||||
+5
-2
@@ -11,6 +11,7 @@
|
||||
#include <Process/TestImpactProcessException.h>
|
||||
|
||||
#include <AzCore/std/parallel/lock.h>
|
||||
#include <AzCore/std/string/conversions.h>
|
||||
|
||||
namespace TestImpact
|
||||
{
|
||||
@@ -55,9 +56,11 @@ namespace TestImpact
|
||||
|
||||
CreatePipes(sa, si);
|
||||
|
||||
if (!CreateProcess(
|
||||
AZStd::wstring argsW;
|
||||
AZStd::to_wstring(argsW, args.c_str());
|
||||
if (!CreateProcessW(
|
||||
NULL,
|
||||
&args[0],
|
||||
argsW.c_str(),
|
||||
NULL,
|
||||
NULL,
|
||||
IsPiping(),
|
||||
|
||||
Reference in New Issue
Block a user