Merge commit 'd0ebe4ee10741eac2d0a623610b89a44f0f3cb49' into puvvadar/gitflow_211118_o3de

2021-11-18 09:37:44 -08:00
parent 59744429f9 d0ebe4ee10
commit 01a31f2c7b
3 changed files with 20 additions and 15 deletions
@@ -238,7 +238,6 @@ namespace AssetUtilities
    // hashMsDelay is only for automated tests to test that writing to a file while it's hashing does not cause a crash.
    // hashMsDelay is not used in non-unit test builds.
    AZ::u64 GetFileHash(const char* filePath, bool force = false, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0);
-    inline constexpr AZ::u64 FileHashBufferSize = 1024 * 64;

    //! Adjusts a timestamp to fix timezone settings and account for any precision adjustment needed
    AZ::u64 AdjustTimestamp(QDateTime timestamp);