Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -1357,9 +1357,7 @@ void CCpuFeatures::Detect(void)
 #if AZ_LEGACY_CRYSYSTEM_TRAIT_HASAFFINITYMASK
    CryLogAlways("");

-    DWORD_PTR process_affinity_mask;
-    uint32  thread_processor_mask = 1;
-    process_affinity_mask = 1;
+    DWORD_PTR process_affinity_mask = 1;

    /* get the system info to derive the number of processors within the system. */