Merge with 1.9.0 fixes.

Author: gregtatcam

src/ripple/protocol/SField.h

@@ -448,7 +448,7 @@ extern SF_UINT256 const sfNFTokenID;
 extern SF_UINT256 const sfEmitParentTxnID;
 extern SF_UINT256 const sfEmitNonce;
 extern SF_UINT256 const sfEmitHookHash;
-extern SF_HASH256 const sfAMMHash;
+extern SF_UINT256 const sfAMMHash;
 
 // 256-bit (uncommon)
 extern SF_UINT256 const sfBookDirectory;

src/ripple/protocol/impl/SField.cpp

@@ -198,7 +198,7 @@ CONSTRUCT_TYPED_SFIELD(sfNFTokenID,             "NFTokenID",            UINT256,
 CONSTRUCT_TYPED_SFIELD(sfEmitParentTxnID,       "EmitParentTxnID",      UINT256,   11);
 CONSTRUCT_TYPED_SFIELD(sfEmitNonce,             "EmitNonce",            UINT256,   12);
 CONSTRUCT_TYPED_SFIELD(sfEmitHookHash,          "EmitHookHash",         UINT256,   13);
-CONSTRUCT_TYPED_SFIELD(sfAMMHash,               "AMMHash",              HASH256,   14);
+CONSTRUCT_TYPED_SFIELD(sfAMMHash,               "AMMHash",              UINT256,   14);
 
 // 256-bit (uncommon)
 CONSTRUCT_TYPED_SFIELD(sfBookDirectory,         "BookDirectory",        UINT256,   16);

src/ripple/shamap/impl/SHAMapInnerNode.cpp

@@ -33,7 +33,6 @@
 #include <iterator>
 #include <utility>
 
-#ifndef __aarch64__
 // This is used for the _mm_pause instruction:
 #include <immintrin.h>
 #endif