Integrating github/staging through commit ab87ed9
This commit is contained in:
+2
-4
@@ -28,8 +28,7 @@ namespace AZ::Platform
|
||||
}
|
||||
else
|
||||
{
|
||||
DWORD error = ::GetLastError();
|
||||
AZ_Assert(event, "Failed to create a required event for IO Scheduler (Error: %u).", error);
|
||||
AZ_Assert(event, "Failed to create a required event for IO Scheduler (Error: %u).", ::GetLastError());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -43,8 +42,7 @@ namespace AZ::Platform
|
||||
{
|
||||
if (!::CloseHandle(event))
|
||||
{
|
||||
DWORD error = ::GetLastError();
|
||||
AZ_Assert(false, "Failed to close an event handle for IO Scheduler (Error: %u)", error);
|
||||
AZ_Assert(false, "Failed to close an event handle for IO Scheduler (Error: %u)", ::GetLastError());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ namespace AZStd
|
||||
// detect a sitaution where the mutex or the cond var are invalid, or the duration
|
||||
AZ_Assert(lastError == AZ_ERROR_TIMEOUT, "Error from SleepConditionVariableCS: 0x%08x\n", lastError);
|
||||
// asserts are continuable so we still check.
|
||||
if (GetLastError() == AZ_ERROR_TIMEOUT)
|
||||
if (lastError == AZ_ERROR_TIMEOUT)
|
||||
{
|
||||
return cv_status::timeout;
|
||||
}
|
||||
|
||||
@@ -70,5 +70,4 @@ set(FILES
|
||||
AzCore/Utils/Utils_iOS.mm
|
||||
../Common/Apple/AzCore/Utils/Utils_Apple.cpp
|
||||
../Common/UnixLike/AzCore/Utils/Utils_UnixLike.cpp
|
||||
../Common/Unimplemented/AzCore/Utils/Utils_Unimplemented.cpp
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user