diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-02-24 01:31:45 +0100 |
| commit | b8edd8aedc75ae4e2abd8c5558af94e98c7bebcb (patch) | |
| tree | c6832e8ac25a78ed769b5b76a1d9e19d5b6e2b27 /Source/Core/Common/Hash.cpp | |
| parent | 7a61bd5519ccc7a648376f4c6b9a5ab2ca3c75da (diff) | |
| parent | daf4aa09471a0113315fa49aa8409bfc9ba947fd (diff) | |
Merge pull request #2101 from Tilka/intrinsics
Clean up the intrinsics #ifdef mess with a common header
Diffstat (limited to 'Source/Core/Common/Hash.cpp')
| -rw-r--r-- | Source/Core/Common/Hash.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index 63caced040..7efc4549d7 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -4,11 +4,9 @@ #include <algorithm> #include "Common/CommonFuncs.h" -#include "Common/Hash.h" -#if _M_SSE >= 0x402 #include "Common/CPUDetect.h" -#include <nmmintrin.h> -#endif +#include "Common/Hash.h" +#include "Common/Intrinsics.h" static u64 (*ptrHashFunction)(const u8 *src, u32 len, u32 samples) = &GetMurmurHash3; |