diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-17 13:38:15 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-17 13:38:15 +0300 |
| commit | 0e3d34e48f5d5ed3845b1858a66008ab87c55af8 (patch) | |
| tree | f52b983a632e11233662bacb7b469d9b6e4663c2 /source/blender/nodes | |
| parent | 0fcd23a3880f0caf4a683203b486d451991edb2d (diff) | |
BLI: add StringRefNull.c_str() method
This should be used whenever you rely on the fact, that the
returned pointer points to the beginning of a null-terminated array.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/NOD_derived_node_tree.hh | 2 | ||||
| -rw-r--r-- | source/blender/nodes/NOD_node_tree_multi_function.hh | 2 | ||||
| -rw-r--r-- | source/blender/nodes/NOD_node_tree_ref.hh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/NOD_derived_node_tree.hh b/source/blender/nodes/NOD_derived_node_tree.hh index 24144496c92..84370dcd399 100644 --- a/source/blender/nodes/NOD_derived_node_tree.hh +++ b/source/blender/nodes/NOD_derived_node_tree.hh @@ -477,7 +477,7 @@ inline Span<const DNode *> DerivedNodeTree::nodes() const inline Span<const DNode *> DerivedNodeTree::nodes_by_type(StringRefNull idname) const { - const bNodeType *nodetype = nodeTypeFind(idname.data()); + const bNodeType *nodetype = nodeTypeFind(idname.c_str()); return this->nodes_by_type(nodetype); } diff --git a/source/blender/nodes/NOD_node_tree_multi_function.hh b/source/blender/nodes/NOD_node_tree_multi_function.hh index d40a630c9f2..f7a1fbb114d 100644 --- a/source/blender/nodes/NOD_node_tree_multi_function.hh +++ b/source/blender/nodes/NOD_node_tree_multi_function.hh @@ -240,7 +240,7 @@ class MFNetworkBuilderBase { BLI_STATIC_ASSERT((std::is_base_of_v<fn::MultiFunction, T>), ""); void *buffer = common_.resources.linear_allocator().allocate(sizeof(T), alignof(T)); T *fn = new (buffer) T(std::forward<Args>(args)...); - common_.resources.add(destruct_ptr<T>(fn), fn->name().data()); + common_.resources.add(destruct_ptr<T>(fn), fn->name().c_str()); return *fn; } }; diff --git a/source/blender/nodes/NOD_node_tree_ref.hh b/source/blender/nodes/NOD_node_tree_ref.hh index b5e4a768bd3..907184125b8 100644 --- a/source/blender/nodes/NOD_node_tree_ref.hh +++ b/source/blender/nodes/NOD_node_tree_ref.hh @@ -405,7 +405,7 @@ inline Span<const NodeRef *> NodeTreeRef::nodes() const inline Span<const NodeRef *> NodeTreeRef::nodes_by_type(StringRefNull idname) const { - const bNodeType *nodetype = nodeTypeFind(idname.data()); + const bNodeType *nodetype = nodeTypeFind(idname.c_str()); return this->nodes_by_type(nodetype); } |