Merge branch 'development' into cmake/AddressSanitizer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-19 12:25:41 -07:00
parent 68b04fa6c1 8ae384e93f
commit 61f7fe5dc5
429 changed files with 1447 additions and 1830 deletions
@@ -30,7 +30,7 @@ namespace AZ
            while (maxAttempts > 0)
            {
                // Use the system's tick count to base the folder name
-                DWORD currentTick = GetTickCount64();
+                ULONGLONG currentTick = GetTickCount64();
                azsnprintf(workingTempPathBuffer, bufferSize, "%sUnitTest-%X", tempDir, aznumeric_cast<unsigned int>(currentTick));

                // Check if the requested directory name is available and re-generate if it already exists