diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-26 23:03:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-26 23:18:45 +0300 |
| commit | c94b6209861ca7cc3985b53474feed7d94c0221a (patch) | |
| tree | 752054f0dca1338cda5cf8ad4f6d18573fcca3b9 /source/blender/blenlib/BLI_hash_cxx.h | |
| parent | 357ed79cb93f9d655501a828c6cddd68282de62d (diff) | |
| parent | afb1a64ccb81b7ed792f64151986f40f53af8da5 (diff) | |
Merge branch 'master' into wm-drag-drop-rewrite
Diffstat (limited to 'source/blender/blenlib/BLI_hash_cxx.h')
| -rw-r--r-- | source/blender/blenlib/BLI_hash_cxx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_hash_cxx.h b/source/blender/blenlib/BLI_hash_cxx.h index e899f27c9ee..22941a792ba 100644 --- a/source/blender/blenlib/BLI_hash_cxx.h +++ b/source/blender/blenlib/BLI_hash_cxx.h @@ -25,12 +25,12 @@ */ #include <functional> +#include <memory> #include <string> #include <utility> -#include <memory> -#include "BLI_utildefines.h" #include "BLI_math_base.h" +#include "BLI_utildefines.h" namespace BLI { @@ -58,6 +58,7 @@ TRIVIAL_DEFAULT_INT_HASH(uint16_t); TRIVIAL_DEFAULT_INT_HASH(int32_t); TRIVIAL_DEFAULT_INT_HASH(uint32_t); TRIVIAL_DEFAULT_INT_HASH(int64_t); +TRIVIAL_DEFAULT_INT_HASH(uint64_t); template<> struct DefaultHash<float> { uint32_t operator()(float value) const |