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/depsgraph/intern | |
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/depsgraph/intern')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_rna.cc | 2 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_type.h | 14 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/node/deg_node_component.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 9fa663b9b6d..94f58427251 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -365,7 +365,7 @@ RNANodeIdentifier RNANodeQuery::construct_node_identifier(const PointerRNA *ptr, RNANodeQueryIDData *RNANodeQuery::ensure_id_data(const ID *id) { unique_ptr<RNANodeQueryIDData> &id_data = id_data_map_.lookup_or_add( - id, [&]() { return BLI::make_unique<RNANodeQueryIDData>(id); }); + id, [&]() { return blender::make_unique<RNANodeQueryIDData>(id); }); return id_data.get(); } diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h index 7016d07ae72..f6901395897 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.h +++ b/source/blender/depsgraph/intern/depsgraph_type.h @@ -53,13 +53,13 @@ struct CustomData_MeshMasks; namespace DEG { /* Commonly used types. */ -using BLI::ArrayRef; -using BLI::Map; -using BLI::Set; -using BLI::StringRef; -using BLI::StringRefNull; -using BLI::Vector; -using BLI::VectorSet; +using blender::ArrayRef; +using blender::Map; +using blender::Set; +using blender::StringRef; +using blender::StringRefNull; +using blender::Vector; +using blender::VectorSet; using std::deque; using std::map; using std::pair; diff --git a/source/blender/depsgraph/intern/node/deg_node_component.h b/source/blender/depsgraph/intern/node/deg_node_component.h index ca37401d200..2d13300d69f 100644 --- a/source/blender/depsgraph/intern/node/deg_node_component.h +++ b/source/blender/depsgraph/intern/node/deg_node_component.h @@ -206,7 +206,7 @@ void deg_register_component_depsnodes(); } // namespace DEG -namespace BLI { +namespace blender { template<> struct DefaultHash<DEG::ComponentNode::OperationIDKey> { uint32_t operator()(const DEG::ComponentNode::OperationIDKey &key) const @@ -219,4 +219,4 @@ template<> struct DefaultHash<DEG::ComponentNode::OperationIDKey> { } }; -} // namespace BLI +} // namespace blender |