Merge branch 'development' into cmake/SPEC-7484

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/ResourceSelectorHost.cpp
2021-08-11 07:55:26 -07:00
parent d71674579a a26d6d5ec9
commit 9f7d280a1e
77 changed files with 248 additions and 1003 deletions
@@ -11,6 +11,7 @@
 #include <AzCore/PlatformIncl.h>
 #include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/condition_variable.h>
+#include <AzCore/std/parallel/atomic.h>

 namespace AZ::Platform
 {
@@ -7,6 +7,7 @@
 */
 #include <AzCore/Debug/StackTracer.h>
 #include <AzCore/Math/MathUtils.h>
+#include <AzCore/Math/Crc.h>

 #include <AzCore/PlatformIncl.h>
 #include <AzCore/std/containers/fixed_vector.h>