[Bf-blender-cvs] [2367dd2a813] virtual-array-attributes: cleanup

[Jacques Lucke]

Commit: 2367dd2a81337ebe43c615cca0015e6abee72778
Author: Jacques Lucke
Date:   Sat Apr 10 17:42:52 2021 +0200
Branches: virtual-array-attributes
https://developer.blender.org/rB2367dd2a81337ebe43c615cca0015e6abee72778

cleanup

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

M	source/blender/blenlib/BLI_virtual_array.hh
M	source/blender/blenlib/tests/BLI_virtual_array_test.cc

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

diff --git a/source/blender/blenlib/BLI_virtual_array.hh b/source/blender/blenlib/BLI_virtual_array.hh
index 860aaecb16f..7d9b8e5905a 100644
--- a/source/blender/blenlib/BLI_virtual_array.hh
+++ b/source/blender/blenlib/BLI_virtual_array.hh
@@ -393,13 +393,13 @@ template<typename T> class VArray_For_Single final : public VArray<T> {
  *    from faster access.
  *  - An API is called, that does not accept virtual arrays, but only spans.
  */
-template<typename T> class VArrayAsSpan final : public VArray_For_Span<T> {
+template<typename T> class VArray_As_Span final : public VArray_For_Span<T> {
  private:
   const VArray<T> &varray_;
   Array<T> owned_data_;
 
  public:
-  VArrayAsSpan(const VArray<T> &varray) : VArray_For_Span<T>(varray.size()), varray_(varray)
+  VArray_As_Span(const VArray<T> &varray) : VArray_For_Span<T>(varray.size()), varray_(varray)
   {
     if (varray_.is_span()) {
       this->set_span_start(varray_.get_span().data());
@@ -423,7 +423,7 @@ template<typename T> class VArrayAsSpan final : public VArray_For_Span<T> {
   }
 };
 
-template<typename T> class VMutableArrayAsSpan final : public VMutableArray_For_Span<T> {
+template<typename T> class VMutableArray_As_Span final : public VMutableArray_For_Span<T> {
  private:
   VMutableArray<T> &varray_;
   Array<T> owned_data_;
@@ -431,7 +431,7 @@ template<typename T> class VMutableArrayAsSpan final : public VMutableArray_For_
   bool show_not_applied_warning_ = true;
 
  public:
-  VMutableArrayAsSpan(VMutableArray<T> &varray) : VMutableArray_For_Span<T>(varray.size())
+  VMutableArray_As_Span(VMutableArray<T> &varray) : VMutableArray_For_Span<T>(varray.size())
   {
     if (varray_.is_span()) {
       this->set_span_start(varray_.get_span().data());
@@ -449,7 +449,7 @@ template<typename T> class VMutableArrayAsSpan final : public VMutableArray_For_
     show_not_applied_warning_ = false;
   }
 
-  ~VMutableArrayAsSpan()
+  ~VMutableArray_As_Span()
   {
     if (show_not_applied_warning_) {
       if (!apply_has_been_called_) {
diff --git a/source/blender/blenlib/tests/BLI_virtual_array_test.cc b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
index 111f3edbd40..ed4f2720914 100644
--- a/source/blender/blenlib/tests/BLI_virtual_array_test.cc
+++ b/source/blender/blenlib/tests/BLI_virtual_array_test.cc
@@ -109,7 +109,7 @@ TEST(virtual_array, AsSpan)
 {
   auto func = [](int64_t index) { return (int)(10 * index); };
   VArray_For_Func<int, decltype(func)> func_varray{10, func};
-  VArrayAsSpan span_varray{func_varray};
+  VArray_As_Span span_varray{func_varray};
   EXPECT_EQ(span_varray.size(), 10);
   Span<int> span = span_varray;
   EXPECT_EQ(span.size(), 10);