diff options
| author | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
| commit | c7904d2398fd4d43d15268c792aa15ea8ee538fe (patch) | |
| tree | 484fd7f66ac59c82abd4aca18894f991b4935483 /source/blender/functions/FN_cpp_type.hh | |
| parent | 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (diff) | |
| parent | 1a100d2d78c75c9a6ac015606cc16698e7775682 (diff) | |
Merge branch 'master' into ui-asset-view-templateui-asset-view-template
Diffstat (limited to 'source/blender/functions/FN_cpp_type.hh')
| -rw-r--r-- | source/blender/functions/FN_cpp_type.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh index 665296f30e1..54ea0103fe5 100644 --- a/source/blender/functions/FN_cpp_type.hh +++ b/source/blender/functions/FN_cpp_type.hh @@ -661,7 +661,7 @@ class CPPType : NonCopyable, NonMovable { uint64_t hash() const { - return DefaultHash<const CPPType *>{}(this); + return get_default_hash(this); } template<typename T> bool is() const @@ -674,6 +674,6 @@ class CPPType : NonCopyable, NonMovable { /* Utility for allocating an uninitialized buffer for a single value of the given #CPPType. */ #define BUFFER_FOR_CPP_TYPE_VALUE(type, variable_name) \ - blender::DynamicStackBuffer<64, 64> stack_buffer_for_##variable_name(type.size(), \ - type.alignment()); \ + blender::DynamicStackBuffer<64, 64> stack_buffer_for_##variable_name((type).size(), \ + (type).alignment()); \ void *variable_name = stack_buffer_for_##variable_name.buffer(); |