[Bf-blender-cvs] [d51db9a526d] functions: don't create array ref from single value

[Jacques Lucke]

Commit: d51db9a526d1667add6bc11bac5fac555845e8aa
Author: Jacques Lucke
Date:   Fri Aug 2 17:42:15 2019 +0200
Branches: functions
https://developer.blender.org/rBd51db9a526d1667add6bc11bac5fac555845e8aa

don't create array ref from single value

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

M	source/blender/blenlib/BLI_array_ref.hpp
M	source/blender/simulations/bparticles/particle_function_builder.cpp
M	tests/gtests/blenlib/BLI_array_ref_test.cc

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

diff --git a/source/blender/blenlib/BLI_array_ref.hpp b/source/blender/blenlib/BLI_array_ref.hpp
index dbb2053b450..c48120f3b0e 100644
--- a/source/blender/blenlib/BLI_array_ref.hpp
+++ b/source/blender/blenlib/BLI_array_ref.hpp
@@ -49,13 +49,6 @@ template<typename T> class ArrayRef {
    */
   ArrayRef() = default;
 
-  /**
-   * Reference a single element as if it were an array with one element.
-   */
-  ArrayRef(T &value) : m_start(&value), m_size(1)
-  {
-  }
-
   ArrayRef(T *start, uint size) : m_start(start), m_size(size)
   {
   }
diff --git a/source/blender/simulations/bparticles/particle_function_builder.cpp b/source/blender/simulations/bparticles/particle_function_builder.cpp
index 2078f533193..2cfadf1aa09 100644
--- a/source/blender/simulations/bparticles/particle_function_builder.cpp
+++ b/source/blender/simulations/bparticles/particle_function_builder.cpp
@@ -44,7 +44,7 @@ static SetVector<VirtualSocket *> find_particle_dependencies(
 
   for (uint i = 0; i < sockets.size(); i++) {
     DataSocket socket = sockets[i];
-    auto dependencies = data_graph.find_placeholder_dependencies(socket);
+    auto dependencies = data_graph.find_placeholder_dependencies({socket});
     bool has_dependency = dependencies.size() > 0;
     r_depends_on_particle_flags[i] = has_dependency;
 
diff --git a/tests/gtests/blenlib/BLI_array_ref_test.cc b/tests/gtests/blenlib/BLI_array_ref_test.cc
index a6604463ef2..ea22964c0ff 100644
--- a/tests/gtests/blenlib/BLI_array_ref_test.cc
+++ b/tests/gtests/blenlib/BLI_array_ref_test.cc
@@ -137,16 +137,6 @@ TEST(array_ref, FromInitializerList)
   test_ref_from_initializer_list({3, 6, 8, 9});
 }
 
-TEST(array_ref, FromSingleValue)
-{
-  int a = 4;
-  IntArrayRef a_ref(a);
-  EXPECT_EQ(a_ref.size(), 1);
-  EXPECT_EQ(a_ref[0], 4);
-  a = 10;
-  EXPECT_EQ(a_ref[0], 10);
-}
-
 TEST(array_ref, FromVector)
 {
   std::vector<int> a = {1, 2, 3, 4};
@@ -235,7 +225,7 @@ TEST(array_ref, FirstLast)
 TEST(array_ref, FirstLast_OneElement)
 {
   int a = 3;
-  IntArrayRef a_ref(a);
+  IntArrayRef a_ref(&a, 1);
   EXPECT_EQ(a_ref.first(), 3);
   EXPECT_EQ(a_ref.last(), 3);
 }