Fast functors

morzhovets · Sep 9, 2023 · ca88d13 · ca88d13
1 parent 8cc4cda
commit ca88d13
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/include/momo/Array.h b/include/momo/Array.h
@@ -338,16 +338,17 @@ class Array
 			}
 		}
 
-		template<bool grow, typename ItemsCreator>
-		void Reset(size_t capacity, size_t count, ItemsCreator itemsCreator)
+		template<bool grow, internal::conceptMoveFunctor<void, Item*> ItemsCreator>
+		void Reset(size_t capacity, size_t count,
+			internal::FastMovableFunctor<ItemsCreator> itemsCreator)
 		{
 			MOMO_ASSERT(count <= capacity);
 			if (grow || capacity > internalCapacity)
 			{
 				Item* items = pvAllocate(capacity);
 				try
 				{
-					itemsCreator(items);
+					std::move(itemsCreator)(items);
 				}
 				catch (...)
 				{
@@ -371,7 +372,7 @@ class Array
 			{
 				MOMO_ASSERT(!pvIsInternal());
 				size_t initCapacity = mCapacity;
-				itemsCreator(&mInternalItems);
+				std::move(itemsCreator)(&mInternalItems);
 				pvDeallocate(mItems, initCapacity);
 				mItems = &mInternalItems;
 				mCount = count;
@@ -683,7 +684,8 @@ class Array
 		{
 			auto itemsCreator = [this, count] (Item* newItems)
 				{ ItemTraits::Relocate(GetMemManager(), GetItems(), newItems, count); };
-			mData.template Reset<false>(capacity, count, itemsCreator);
+			mData.template Reset<false>(capacity, count,
+				internal::FastMovableFunctor(std::move(itemsCreator)));
 		}
 	}
 
@@ -937,7 +939,8 @@ class Array
 			size_t count = GetCount();
 			auto itemsCreator = [this, count] (Item* newItems)
 				{ ItemTraits::Relocate(GetMemManager(), GetItems(), newItems, count); };
-			mData.template Reset<true>(newCapacityExp, count, itemsCreator);
+			mData.template Reset<true>(newCapacityExp, count,
+				internal::FastMovableFunctor(std::move(itemsCreator)));
 		}
 	}
 
@@ -984,7 +987,8 @@ class Array
 					throw;
 				}
 			};
-			mData.template Reset<true>(newCapacity, newCount, itemsCreator);
+			mData.template Reset<true>(newCapacity, newCount,
+				internal::FastMovableFunctor(std::move(itemsCreator)));
 		}
 	}
 
@@ -1024,7 +1028,8 @@ class Array
 			ItemTraits::RelocateCreate(GetMemManager(), GetItems(), newItems, initCount,
 				std::move(itemCreator), newItems + initCount);
 		};
-		mData.template Reset<true>(newCapacity, newCount, std::move(itemsCreator));
+		mData.template Reset<true>(newCapacity, newCount,
+			internal::FastMovableFunctor(std::move(itemsCreator)));
 	}
 
 	template<internal::conceptTrivialObjectCreator<Item> ItemCreator>

diff --git a/include/momo/Utility.h b/include/momo/Utility.h
@@ -194,7 +194,7 @@ namespace internal
 			BaseFunctor, BaseFunctor&&> BaseFunctorReference;
 
 	public:
-		explicit FastMovableFunctor(BaseFunctorReference baseFunctor) noexcept
+		explicit FastMovableFunctor(BaseFunctor&& baseFunctor) noexcept
 			: mBaseFunctor(std::forward<BaseFunctor>(baseFunctor))
 		{
 		}
@@ -229,7 +229,7 @@ namespace internal
 			BaseFunctor, const BaseFunctor&> BaseFunctorReference;
 
 	public:
-		explicit FastCopyableFunctor(BaseFunctorReference baseFunctor) noexcept
+		explicit FastCopyableFunctor(const BaseFunctor& baseFunctor) noexcept
 			: mBaseFunctor(baseFunctor)
 		{
 		}