Commit: f179b2dd304f2c1ed367e245bf20298a5745b50a Author: Jacques Lucke Date: Mon Jul 22 16:59:52 2019 +0200 Branches: functions https://developer.blender.org/rBf179b2dd304f2c1ed367e245bf20298a5745b50a
rename SmallSetVector to SetVector =================================================================== R087 source/blender/blenlib/BLI_small_set_vector.hpp source/blender/blenlib/BLI_set_vector.hpp M source/blender/blenlib/CMakeLists.txt M source/blender/functions/backends/dependencies/dependencies.hpp M source/blender/functions/core/data_flow_graph_builder.hpp M source/blender/functions/core/function_graph.hpp M source/blender/simulations/bparticles/attributes.hpp M source/blender/simulations/bparticles/particles_container.hpp R093 tests/gtests/blenlib/BLI_small_set_vector_test.cc tests/gtests/blenlib/BLI_set_vector_test.cc M tests/gtests/blenlib/CMakeLists.txt =================================================================== diff --git a/source/blender/blenlib/BLI_small_set_vector.hpp b/source/blender/blenlib/BLI_set_vector.hpp similarity index 87% rename from source/blender/blenlib/BLI_small_set_vector.hpp rename to source/blender/blenlib/BLI_set_vector.hpp index a1e491d17a4..8f604ad8ffc 100644 --- a/source/blender/blenlib/BLI_small_set_vector.hpp +++ b/source/blender/blenlib/BLI_set_vector.hpp @@ -28,17 +28,17 @@ namespace BLI { -template<typename T> class SmallSetVector : public Set<T> { +template<typename T> class SetVector : public Set<T> { public: - SmallSetVector() : Set<T>() + SetVector() : Set<T>() { } - SmallSetVector(const std::initializer_list<T> &values) : Set<T>(values) + SetVector(const std::initializer_list<T> &values) : Set<T>(values) { } - SmallSetVector(const SmallVector<T> &values) : Set<T>(values) + SetVector(const SmallVector<T> &values) : Set<T>(values) { } diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 56ee74c8eb0..2c175564adc 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -255,7 +255,7 @@ set(SRC BLI_small_map.hpp BLI_small_multimap.hpp BLI_set.hpp - BLI_small_set_vector.hpp + BLI_set_vector.hpp BLI_small_stack.hpp BLI_string_map.hpp BLI_string_ref.hpp diff --git a/source/blender/functions/backends/dependencies/dependencies.hpp b/source/blender/functions/backends/dependencies/dependencies.hpp index 963c9c76b27..44ed37dbb6b 100644 --- a/source/blender/functions/backends/dependencies/dependencies.hpp +++ b/source/blender/functions/backends/dependencies/dependencies.hpp @@ -8,8 +8,8 @@ struct Object; namespace FN { struct DependencyComponents { - SmallSetVector<Object *> transform_dependencies; - SmallSetVector<Object *> geometry_dependencies; + SetVector<Object *> transform_dependencies; + SetVector<Object *> geometry_dependencies; }; class FunctionDepsBuilder { diff --git a/source/blender/functions/core/data_flow_graph_builder.hpp b/source/blender/functions/core/data_flow_graph_builder.hpp index 61e990644f1..d1bd6b3e874 100644 --- a/source/blender/functions/core/data_flow_graph_builder.hpp +++ b/source/blender/functions/core/data_flow_graph_builder.hpp @@ -11,7 +11,7 @@ #include "source_info.hpp" #include "BLI_optional.hpp" -#include "BLI_small_set_vector.hpp" +#include "BLI_set_vector.hpp" #include "BLI_monotonic_allocator.hpp" #include "BLI_small_multimap.hpp" @@ -24,7 +24,7 @@ class DataFlowGraph; using DFGB_SocketSet = Set<DFGB_Socket>; using DFGB_SocketVector = SmallVector<DFGB_Socket>; -using DFGB_SocketSetVector = SmallSetVector<DFGB_Socket>; +using DFGB_SocketSetVector = SetVector<DFGB_Socket>; class DFGB_Socket { public: diff --git a/source/blender/functions/core/function_graph.hpp b/source/blender/functions/core/function_graph.hpp index a95d763633b..af1c0811326 100644 --- a/source/blender/functions/core/function_graph.hpp +++ b/source/blender/functions/core/function_graph.hpp @@ -10,7 +10,7 @@ namespace FN { -using DFGraphSocketSetVector = SmallSetVector<DFGraphSocket>; +using DFGraphSocketSetVector = SetVector<DFGraphSocket>; class FunctionGraph { private: diff --git a/source/blender/simulations/bparticles/attributes.hpp b/source/blender/simulations/bparticles/attributes.hpp index 5cffb7fbbed..7722e153c7a 100644 --- a/source/blender/simulations/bparticles/attributes.hpp +++ b/source/blender/simulations/bparticles/attributes.hpp @@ -7,7 +7,7 @@ #include "BLI_math.hpp" #include "BLI_string_ref.hpp" #include "BLI_range.hpp" -#include "BLI_small_set_vector.hpp" +#include "BLI_set_vector.hpp" #include "BLI_array_allocator.hpp" #include "BLI_optional.hpp" @@ -18,7 +18,7 @@ using BLI::ArrayRef; using BLI::float3; using BLI::Optional; using BLI::Range; -using BLI::SmallSetVector; +using BLI::SetVector; using BLI::SmallVector; using BLI::StringRef; using BLI::StringRefNull; @@ -57,9 +57,9 @@ class AttributesInfo; class AttributesDeclaration { private: - SmallSetVector<std::string> m_byte_names; - SmallSetVector<std::string> m_float_names; - SmallSetVector<std::string> m_float3_names; + SetVector<std::string> m_byte_names; + SetVector<std::string> m_float_names; + SetVector<std::string> m_float3_names; SmallVector<uint8_t> m_byte_defaults; SmallVector<float> m_float_defaults; SmallVector<float3> m_float3_defaults; @@ -91,7 +91,7 @@ class AttributesInfo { Range<uint> m_float_attributes; Range<uint> m_float3_attributes; SmallVector<AttributeType> m_types; - SmallSetVector<std::string> m_indices; + SetVector<std::string> m_indices; SmallVector<uint8_t> m_byte_defaults; SmallVector<float> m_float_defaults; diff --git a/source/blender/simulations/bparticles/particles_container.hpp b/source/blender/simulations/bparticles/particles_container.hpp index f77b20feb96..b4a59f5e94d 100644 --- a/source/blender/simulations/bparticles/particles_container.hpp +++ b/source/blender/simulations/bparticles/particles_container.hpp @@ -27,7 +27,7 @@ class ParticlesBlock; class ParticlesContainer { private: AttributesInfo m_attributes_info; - SmallSetVector<ParticlesBlock *> m_active_blocks; + SetVector<ParticlesBlock *> m_active_blocks; SmallStack<ParticlesBlock *> m_cached_blocks; uint m_block_size; std::mutex m_blocks_mutex; diff --git a/tests/gtests/blenlib/BLI_small_set_vector_test.cc b/tests/gtests/blenlib/BLI_set_vector_test.cc similarity index 93% rename from tests/gtests/blenlib/BLI_small_set_vector_test.cc rename to tests/gtests/blenlib/BLI_set_vector_test.cc index 77d3e977f92..3036dee1e8c 100644 --- a/tests/gtests/blenlib/BLI_small_set_vector_test.cc +++ b/tests/gtests/blenlib/BLI_set_vector_test.cc @@ -1,7 +1,7 @@ #include "testing/testing.h" -#include "BLI_small_set_vector.hpp" +#include "BLI_set_vector.hpp" -using IntSetVector = BLI::SmallSetVector<int>; +using IntSetVector = BLI::SetVector<int>; TEST(small_set_vector, DefaultConstructor) { diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt index d34f832e55d..d6aa7d4feb1 100644 --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@ -66,7 +66,7 @@ BLENDER_TEST(BLI_range "bf_blenlib") BLENDER_TEST(BLI_shared "bf_blenlib") BLENDER_TEST(BLI_small_vector "bf_blenlib") BLENDER_TEST(BLI_set "bf_blenlib") -BLENDER_TEST(BLI_small_set_vector "bf_blenlib") +BLENDER_TEST(BLI_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") _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs