diff options
author | Jacques Lucke <jacques@blender.org> | 2020-06-09 11:27:24 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-06-09 11:27:24 +0300 |
commit | 9bb7d6ed68ef1aa0e6acc3e70901cb6b79c682d2 (patch) | |
tree | 843993222b8ee5c02451207404ceb113323ede6f /source/blender/functions | |
parent | d8678e02ecec9375bec1dcf1388c6fc8b4ce3ad2 (diff) |
BLI: put C++ data structures in "blender" namespace instead of "BLI"
We plan to use the "blender" namespace in other modules as well.
Diffstat (limited to 'source/blender/functions')
-rw-r--r-- | source/blender/functions/FN_cpp_type.hh | 18 | ||||
-rw-r--r-- | source/blender/functions/intern/cpp_types.cc | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/functions/FN_cpp_type.hh b/source/blender/functions/FN_cpp_type.hh index df6da7a3f47..d580ce54f1d 100644 --- a/source/blender/functions/FN_cpp_type.hh +++ b/source/blender/functions/FN_cpp_type.hh @@ -72,9 +72,9 @@ namespace FN { -using BLI::IndexMask; -using BLI::StringRef; -using BLI::StringRefNull; +using blender::IndexMask; +using blender::StringRef; +using blender::StringRefNull; class CPPType { public: @@ -538,7 +538,7 @@ template<typename T> void construct_default_cb(void *ptr) } template<typename T> void construct_default_n_cb(void *ptr, uint n) { - BLI::default_construct_n((T *)ptr, n); + blender::default_construct_n((T *)ptr, n); } template<typename T> void construct_default_indices_cb(void *ptr, IndexMask index_mask) { @@ -551,7 +551,7 @@ template<typename T> void destruct_cb(void *ptr) } template<typename T> void destruct_n_cb(void *ptr, uint n) { - BLI::destruct_n((T *)ptr, n); + blender::destruct_n((T *)ptr, n); } template<typename T> void destruct_indices_cb(void *ptr, IndexMask index_mask) { @@ -583,11 +583,11 @@ void copy_to_initialized_indices_cb(const void *src, void *dst, IndexMask index_ template<typename T> void copy_to_uninitialized_cb(const void *src, void *dst) { - BLI::uninitialized_copy_n((T *)src, 1, (T *)dst); + blender::uninitialized_copy_n((T *)src, 1, (T *)dst); } template<typename T> void copy_to_uninitialized_n_cb(const void *src, void *dst, uint n) { - BLI::uninitialized_copy_n((T *)src, n, (T *)dst); + blender::uninitialized_copy_n((T *)src, n, (T *)dst); } template<typename T> void copy_to_uninitialized_indices_cb(const void *src, void *dst, IndexMask index_mask) @@ -608,7 +608,7 @@ template<typename T> void relocate_to_initialized_cb(void *src, void *dst) } template<typename T> void relocate_to_initialized_n_cb(void *src, void *dst, uint n) { - BLI::initialized_relocate_n((T *)src, n, (T *)dst); + blender::initialized_relocate_n((T *)src, n, (T *)dst); } template<typename T> void relocate_to_initialized_indices_cb(void *src, void *dst, IndexMask index_mask) @@ -632,7 +632,7 @@ template<typename T> void relocate_to_uninitialized_cb(void *src, void *dst) } template<typename T> void relocate_to_uninitialized_n_cb(void *src, void *dst, uint n) { - BLI::uninitialized_relocate_n((T *)src, n, (T *)dst); + blender::uninitialized_relocate_n((T *)src, n, (T *)dst); } template<typename T> void relocate_to_uninitialized_indices_cb(void *src, void *dst, IndexMask index_mask) diff --git a/source/blender/functions/intern/cpp_types.cc b/source/blender/functions/intern/cpp_types.cc index 3435c9c6eca..6e548d65192 100644 --- a/source/blender/functions/intern/cpp_types.cc +++ b/source/blender/functions/intern/cpp_types.cc @@ -26,15 +26,15 @@ namespace FN { MAKE_CPP_TYPE(bool, bool) MAKE_CPP_TYPE(float, float) -MAKE_CPP_TYPE(float3, BLI::float3) -MAKE_CPP_TYPE(float4x4, BLI::float4x4) +MAKE_CPP_TYPE(float3, blender::float3) +MAKE_CPP_TYPE(float4x4, blender::float4x4) MAKE_CPP_TYPE(int32, int32_t) MAKE_CPP_TYPE(uint32, uint32_t) MAKE_CPP_TYPE(uint8, uint8_t) -MAKE_CPP_TYPE(Color4f, BLI::Color4f) -MAKE_CPP_TYPE(Color4b, BLI::Color4b) +MAKE_CPP_TYPE(Color4f, blender::Color4f) +MAKE_CPP_TYPE(Color4b, blender::Color4b) MAKE_CPP_TYPE(string, std::string) |