stl: fix make_shared creating the type twice

matcool · Aug 7, 2023 · 2ff6ee2 · 2ff6ee2
1 parent b6aa11a
commit 2ff6ee2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/stl/pointer.hpp b/stl/pointer.hpp
@@ -22,7 +22,8 @@ class SharedPtr {
 	struct ControlBlock : STL_NS_IMPL::BaseControlBlock {
 		Type value;
 
-		ControlBlock(Type value) : value(value) {}
+		template <class... Args>
+		ControlBlock(Args&&... args) : value(forward<Args>(args)...) {}
 
 		void* get_value() const override { return const_cast<Type*>(&value); }
 	};
@@ -104,7 +105,8 @@ class SharedPtr {
 
 template <class Type, class... Args>
 SharedPtr<Type> make_shared(Args&&... args) {
-	return SharedPtr<Type>(new typename SharedPtr<Type>::ControlBlock(Type(forward<Args>(args)...)));
+	using Block = typename SharedPtr<Type>::ControlBlock;
+	return SharedPtr<Type>(new Block(forward<Args>(args)...));
 }
 
 }