From 9bb7d6ed68ef1aa0e6acc3e70901cb6b79c682d2 Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Tue, 9 Jun 2020 10:27:24 +0200
Subject: BLI: put C++ data structures in "blender" namespace instead of "BLI"

We plan to use the "blender" namespace in other modules as well.
---
 source/blender/depsgraph/intern/builder/deg_builder_rna.cc |  2 +-
 source/blender/depsgraph/intern/depsgraph_type.h           | 14 +++++++-------
 source/blender/depsgraph/intern/node/deg_node_component.h  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source/blender/depsgraph/intern')

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
-- 
cgit v1.2.3