From 5d79f9f276b4b3e6289308c534c58e7ee3bb5e2d Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Sun, 5 Jul 2020 16:30:26 +0200
Subject: BLI: refactor how buffers for small object optimization are stored

---
 tests/gtests/blenlib/BLI_array_test.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/gtests/blenlib/BLI_array_test.cc b/tests/gtests/blenlib/BLI_array_test.cc
index 9c77c69e296..b65402cd1fd 100644
--- a/tests/gtests/blenlib/BLI_array_test.cc
+++ b/tests/gtests/blenlib/BLI_array_test.cc
@@ -138,23 +138,22 @@ TEST(array, NoInitializationSizeConstructor)
 {
   using MyArray = Array<ConstructibleType>;
 
-  AlignedBuffer<sizeof(MyArray), alignof(MyArray)> buffer;
-  char *buffer_ptr = (char *)buffer.ptr();
-  memset(buffer_ptr, 100, sizeof(MyArray));
+  TypedBuffer<MyArray> buffer;
+  memset(buffer, 100, sizeof(MyArray));
 
   /* Doing this to avoid some compiler optimization. */
   for (uint i : IndexRange(sizeof(MyArray))) {
-    EXPECT_EQ(buffer_ptr[i], 100);
+    EXPECT_EQ(((char *)buffer.ptr())[i], 100);
   }
 
   {
-    MyArray &array = *new (buffer.ptr()) MyArray(1, NoInitialization());
+    MyArray &array = *new (buffer) MyArray(1, NoInitialization());
     EXPECT_EQ(array[0].value, 100);
     array.clear_without_destruct();
     array.~Array();
   }
   {
-    MyArray &array = *new (buffer.ptr()) MyArray(1);
+    MyArray &array = *new (buffer) MyArray(1);
     EXPECT_EQ(array[0].value, 42);
     array.~Array();
   }
-- 
cgit v1.2.3