Simplified _memOwner by base alias

OleErikPeistorpet · Jun 3, 2024 · c5955db · c5955db
1 parent 5e5abc5
commit c5955db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/dynarray.h b/dynarray.h
@@ -288,16 +288,18 @@ class dynarray
 
 	struct _memOwner : public _internBase, public _usedAlloc_7KQw
 	{
-		using ::oel::_detail::DynarrBase<value_type *>::data;  // owner
-		using ::oel::_detail::DynarrBase<value_type *>::end;
-		using ::oel::_detail::DynarrBase<value_type *>::reservEnd;
+		using B = ::oel::_detail::DynarrBase<value_type *>;
+
+		using B::data;  // owner
+		using B::end;
+		using B::reservEnd;
 
 		constexpr _memOwner(_argAlloc_7KQw & a) noexcept
-		 :	::oel::_detail::DynarrBase<value_type *>{}, _usedAlloc_7KQw{std::move(a)} {
+		 :	B{}, _usedAlloc_7KQw{std::move(a)} {
 		}
 
 		constexpr _memOwner(_memOwner && other) noexcept
-		 :	::oel::_detail::DynarrBase<value_type *>{other}, _usedAlloc_7KQw{std::move(other)}
+		 :	B{other}, _usedAlloc_7KQw{std::move(other)}
 		{
 			other.reservEnd = other.end = other.data = nullptr;
 		}
@@ -306,8 +308,8 @@ class dynarray
 		{
 			if (data)
 			{
-				::oel::_detail::DebugAllocateWrapper<_usedAlloc_7KQw, value_type *>
-					::dealloc(*this, data, static_cast<size_t>(reservEnd - data));
+				auto cap = static_cast<size_t>(reservEnd - data);
+				::oel::_detail::DebugAllocateWrapper<_usedAlloc_7KQw, value_type *>::dealloc(*this, data, cap);
 			}
 		}
 	}

diff --git a/unit_test/test_classes.h b/unit_test/test_classes.h
@@ -275,7 +275,7 @@ struct TrackingAllocator : TrackingAllocatorBase<T>
 	}
 
 	// Testing collision with internal names in dynarray
-	using allocator_type = TrackingAllocatorBase<T>;
+	using allocator_type = TrackingAllocatorBase<char>;
 	using Alloc = void;
 	struct oel {};
 	struct _detail {};