[Bf-blender-cvs] [39989cb1061] functions: rename multimap to multi_map

[Jacques Lucke]

Commit: 39989cb10610904fa225cfbb30e3f3c251b2cae6
Author: Jacques Lucke
Date:   Mon Aug 5 13:43:00 2019 +0200
Branches: functions
https://developer.blender.org/rB39989cb10610904fa225cfbb30e3f3c251b2cae6

rename multimap to multi_map

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

M	source/blender/blenkernel/BKE_node_tree.hpp
R100	source/blender/blenlib/BLI_multimap.hpp	source/blender/blenlib/BLI_multi_map.hpp
M	source/blender/blenlib/CMakeLists.txt
M	source/blender/functions/backends/dependencies/dependencies.hpp
M	source/blender/simulations/bparticles/node_frontend.cpp
M	tests/gtests/blenlib/BLI_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 baaf596f0a6..fa69169fb7b 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -7,7 +7,7 @@
 #include "BLI_map.hpp"
 #include "BLI_vector.hpp"
 #include "BLI_listbase_wrapper.hpp"
-#include "BLI_multimap.hpp"
+#include "BLI_multi_map.hpp"
 #include "BLI_monotonic_allocator.hpp"
 
 #include "RNA_access.h"
diff --git a/source/blender/blenlib/BLI_multimap.hpp b/source/blender/blenlib/BLI_multi_map.hpp
similarity index 100%
rename from source/blender/blenlib/BLI_multimap.hpp
rename to source/blender/blenlib/BLI_multi_map.hpp
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 7a6df49b573..47b3d480d71 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -252,7 +252,7 @@ set(SRC
   BLI_shared.hpp
   BLI_vector.hpp
   BLI_map.hpp
-  BLI_multimap.hpp
+  BLI_multi_map.hpp
   BLI_set.hpp
   BLI_set_vector.hpp
   BLI_stack.hpp
diff --git a/source/blender/functions/backends/dependencies/dependencies.hpp b/source/blender/functions/backends/dependencies/dependencies.hpp
index 7c6482be5ba..b9cd18e003f 100644
--- a/source/blender/functions/backends/dependencies/dependencies.hpp
+++ b/source/blender/functions/backends/dependencies/dependencies.hpp
@@ -2,7 +2,7 @@
 
 #include "FN_core.hpp"
 
-#include "BLI_multimap.hpp"
+#include "BLI_multi_map.hpp"
 
 struct ID;
 struct Object;
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index ba4cf6882ff..68d2b52afb3 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -1,5 +1,5 @@
 #include "BLI_timeit.hpp"
-#include "BLI_multimap.hpp"
+#include "BLI_multi_map.hpp"
 
 #include "node_frontend.hpp"
 #include "inserters.hpp"
diff --git a/tests/gtests/blenlib/BLI_multimap_test.cc b/tests/gtests/blenlib/BLI_multimap_test.cc
index 678300eabf9..83290ed41d3 100644
--- a/tests/gtests/blenlib/BLI_multimap_test.cc
+++ b/tests/gtests/blenlib/BLI_multimap_test.cc
@@ -1,17 +1,17 @@
 #include "testing/testing.h"
-#include "BLI_multimap.hpp"
+#include "BLI_multi_map.hpp"
 
 using namespace BLI;
 
 using IntMultiMap = MultiMap<int, int>;
 
-TEST(multimap, DefaultConstructor)
+TEST(multi_map, DefaultConstructor)
 {
   IntMultiMap map;
   EXPECT_EQ(map.key_amount(), 0);
 }
 
-TEST(multimap, AddNewSingle)
+TEST(multi_map, AddNewSingle)
 {
   IntMultiMap map;
   map.add_new(2, 5);
@@ -21,7 +21,7 @@ TEST(multimap, AddNewSingle)
   EXPECT_EQ(map.lookup(2)[0], 5);
 }
 
-TEST(multimap, AddMultipleforSameKey)
+TEST(multi_map, AddMultipleforSameKey)
 {
   IntMultiMap map;
   map.add(3, 5);
@@ -34,7 +34,7 @@ TEST(multimap, AddMultipleforSameKey)
   EXPECT_EQ(map.lookup(3)[2], 7);
 }
 
-TEST(multimap, AddMany)
+TEST(multi_map, AddMany)
 {
   IntMultiMap map;
   for (uint i = 0; i < 100; i++) {
@@ -50,7 +50,7 @@ TEST(multimap, AddMany)
   EXPECT_EQ(map.lookup(7).size(), 10);
 }
 
-TEST(multimap, AddMultiple)
+TEST(multi_map, AddMultiple)
 {
   IntMultiMap map;
   map.add_multiple(2, {6, 7, 8});
@@ -66,7 +66,7 @@ TEST(multimap, AddMultiple)
   EXPECT_EQ(map.lookup_default(2)[4], 1);
 }
 
-TEST(multimap, AddMultipleNew)
+TEST(multi_map, AddMultipleNew)
 {
   IntMultiMap map;
   map.add_multiple_new(3, {6, 7, 8});
@@ -79,7 +79,7 @@ TEST(multimap, AddMultipleNew)
   EXPECT_FALSE(map.lookup(2).contains(3));
 }
 
-TEST(multimap, ValuesForKey)
+TEST(multi_map, ValuesForKey)
 {
   IntMultiMap map;
   map.add(3, 5);
@@ -91,7 +91,7 @@ TEST(multimap, ValuesForKey)
   EXPECT_EQ(map.value_amount(4), 2);
 }
 
-TEST(multimap, Keys)
+TEST(multi_map, Keys)
 {
   IntMultiMap map;
   map.add(3, 6);
diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt
index 608537d5204..54542bebeab 100644
--- a/tests/gtests/blenlib/CMakeLists.txt
+++ b/tests/gtests/blenlib/CMakeLists.txt
@@ -70,7 +70,7 @@ BLENDER_TEST(BLI_set "bf_blenlib")
 BLENDER_TEST(BLI_set_vector "bf_blenlib")
 BLENDER_TEST(BLI_stack_cpp "bf_blenlib")
 BLENDER_TEST(BLI_map "bf_blenlib")
-BLENDER_TEST(BLI_multimap "bf_blenlib")
+BLENDER_TEST(BLI_multi_map "bf_blenlib")
 BLENDER_TEST(BLI_stack "bf_blenlib")
 BLENDER_TEST(BLI_string "bf_blenlib")
 BLENDER_TEST(BLI_string_ref "bf_blenlib")