[Bf-blender-cvs] [2e701cbaaff] functions: rename file to BLI_small_multimap

Jacques Lucke noreply at git.blender.org
Sat Jul 6 18:01:30 CEST 2019


Commit: 2e701cbaaff218feeea40afb4325c0a16cc2dfe9
Author: Jacques Lucke
Date:   Sat Jul 6 18:01:23 2019 +0200
Branches: functions
https://developer.blender.org/rB2e701cbaaff218feeea40afb4325c0a16cc2dfe9

rename file to BLI_small_multimap

===================================================================

M	source/blender/blenkernel/BKE_node_tree.hpp
R100	source/blender/blenlib/BLI_multimap.hpp	source/blender/blenlib/BLI_small_multimap.hpp
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/functions/core/data_flow_graph_builder.hpp
R098	tests/gtests/blenlib/BLI_multimap_test.cc	tests/gtests/blenlib/BLI_small_multimap_test.cc
M	tests/gtests/blenlib/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_node_tree.hpp
index d78a7afaab9..d996cff5a1a 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -7,7 +7,7 @@
 #include "BLI_small_map.hpp"
 #include "BLI_small_vector.hpp"
 #include "BLI_listbase_wrapper.hpp"
-#include "BLI_multimap.hpp"
+#include "BLI_small_multimap.hpp"
 
 #include "RNA_access.h"
 
diff --git a/source/blender/blenlib/BLI_multimap.hpp b/source/blender/blenlib/BLI_small_multimap.hpp
similarity index 100%
rename from source/blender/blenlib/BLI_multimap.hpp
rename to source/blender/blenlib/BLI_small_multimap.hpp
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 5ac30e82977..2ce6d1871ae 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -246,13 +246,13 @@ set(SRC
   BLI_math.hpp
   BLI_mempool.hpp
   BLI_monotonic_allocator.hpp
-  BLI_multimap.hpp
   BLI_object_pool.hpp
   BLI_optional.hpp
   BLI_range.hpp
   BLI_shared.hpp
   BLI_small_vector.hpp
   BLI_small_map.hpp
+  BLI_small_multimap.hpp
   BLI_small_set.hpp
   BLI_small_set_vector.hpp
   BLI_small_stack.hpp
diff --git a/source/blender/functions/core/data_flow_graph_builder.hpp b/source/blender/functions/core/data_flow_graph_builder.hpp
index 1829a10236a..eab6f9c0a83 100644
--- a/source/blender/functions/core/data_flow_graph_builder.hpp
+++ b/source/blender/functions/core/data_flow_graph_builder.hpp
@@ -13,7 +13,7 @@
 #include "BLI_optional.hpp"
 #include "BLI_small_set_vector.hpp"
 #include "BLI_monotonic_allocator.hpp"
-#include "BLI_multimap.hpp"
+#include "BLI_small_multimap.hpp"
 
 namespace FN {
 
diff --git a/tests/gtests/blenlib/BLI_multimap_test.cc b/tests/gtests/blenlib/BLI_small_multimap_test.cc
similarity index 98%
rename from tests/gtests/blenlib/BLI_multimap_test.cc
rename to tests/gtests/blenlib/BLI_small_multimap_test.cc
index 89672dee73c..5c6df5fa3bf 100644
--- a/tests/gtests/blenlib/BLI_multimap_test.cc
+++ b/tests/gtests/blenlib/BLI_small_multimap_test.cc
@@ -1,5 +1,5 @@
 #include "testing/testing.h"
-#include "BLI_multimap.hpp"
+#include "BLI_small_multimap.hpp"
 
 using namespace BLI;
 
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 9672d07c32b..0b38f22e0fe 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -59,7 +59,6 @@ BLENDER_TEST(BLI_math_color "bf_blenlib")
 BLENDER_TEST(BLI_math_geom "bf_blenlib")
 BLENDER_TEST(BLI_memiter "bf_blenlib")
 BLENDER_TEST(BLI_mempool "bf_blenlib")
-BLENDER_TEST(BLI_multimap "bf_blenlib")
 BLENDER_TEST(BLI_optional "bf_blenlib")
 BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}")
 BLENDER_TEST(BLI_polyfill_2d "bf_blenlib")
@@ -70,6 +69,7 @@ BLENDER_TEST(BLI_small_set "bf_blenlib")
 BLENDER_TEST(BLI_small_set_vector "bf_blenlib")
 BLENDER_TEST(BLI_small_stack "bf_blenlib")
 BLENDER_TEST(BLI_small_map "bf_blenlib")
+BLENDER_TEST(BLI_small_multimap "bf_blenlib")
 BLENDER_TEST(BLI_stack "bf_blenlib")
 BLENDER_TEST(BLI_string "bf_blenlib")
 BLENDER_TEST(BLI_string_ref "bf_blenlib")



More information about the Bf-blender-cvs mailing list