diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-06-28 14:13:52 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-06-28 14:16:32 +0300 |
| commit | 7d281a4f7d354d270fc9c9f3c7a65b4409362aa0 (patch) | |
| tree | 6a749a4833bdf543a10d95881fcca52ba310248b /source/blender/functions/intern/cpp_types.cc | |
| parent | f7e2559fd649610881b1749b6d30cc2ba9fcbdb6 (diff) | |
Functions: improve CPPType
* Reduce code duplication.
* Give methods more standardized names (e.g. `move_to_initialized` -> `move_assign`).
* Support wrapping arbitrary C++ types, even those that e.g. are not copyable.
Diffstat (limited to 'source/blender/functions/intern/cpp_types.cc')
| -rw-r--r-- | source/blender/functions/intern/cpp_types.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/functions/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc index 9c2c1621e23..7be34d2a1bf 100644 --- a/source/blender/functions/intern/cpp_types.cc +++ b/source/blender/functions/intern/cpp_types.cc @@ -23,20 +23,20 @@ namespace blender::fn { -MAKE_CPP_TYPE(bool, bool) +MAKE_CPP_TYPE(bool, bool, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(float, float) -MAKE_CPP_TYPE(float2, blender::float2) -MAKE_CPP_TYPE(float3, blender::float3) -MAKE_CPP_TYPE(float4x4, blender::float4x4) +MAKE_CPP_TYPE(float, float, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(float2, blender::float2, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(float3, blender::float3, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(float4x4, blender::float4x4, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(int32, int32_t) -MAKE_CPP_TYPE(uint32, uint32_t) -MAKE_CPP_TYPE(uint8, uint8_t) +MAKE_CPP_TYPE(int32, int32_t, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(uint32, uint32_t, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(uint8, uint8_t, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(ColorGeometry4f, blender::ColorGeometry4f) -MAKE_CPP_TYPE(ColorGeometry4b, blender::ColorGeometry4b) +MAKE_CPP_TYPE(ColorGeometry4f, blender::ColorGeometry4f, CPPTypeFlags::BasicType) +MAKE_CPP_TYPE(ColorGeometry4b, blender::ColorGeometry4b, CPPTypeFlags::BasicType) -MAKE_CPP_TYPE(string, std::string) +MAKE_CPP_TYPE(string, std::string, CPPTypeFlags::BasicType) } // namespace blender::fn |