Fixed incorrect dynarray constructor sometimes chosen

OleErikPeistorpet · Jun 6, 2024 · a92ac01 · a92ac01
1 parent 0bd4b90
commit a92ac01
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/auxi/dynarray_detail.h b/auxi/dynarray_detail.h
@@ -23,6 +23,13 @@ namespace oel::_detail
 		}
 	};
 
+
+	template< typename ToConstruct, typename FromRange,
+		typename /*EnableIfRange*/ = iterator_t<FromRange>,
+		typename SansCVRef = std::remove_cv_t< std::remove_reference_t<FromRange> >
+	>
+	using EnableIfShouldConstructFromRange = enable_if< !std::is_same_v<SansCVRef, ToConstruct> >;
+
 ////////////////////////////////////////////////////////////////////////////////
 
 	struct DebugAllocationHeader

diff --git a/dynarray.h b/dynarray.h
@@ -94,7 +94,8 @@ class dynarray
 	auto result = dynarray(boost::range::istream_range<int>(someStream));
 	@endcode  */
 	template< typename InputRange,
-	          typename /*EnableIfRange*/ = iterator_t<InputRange> >
+		_detail::EnableIfShouldConstructFromRange<dynarray, InputRange> = 0
+	>
 	explicit dynarray(InputRange && r, Alloc a = Alloc{})      : _m(a) { append(r); }
 
 	dynarray(std::initializer_list<T> il, Alloc a = Alloc{})   : _m(a) { append(il); }

diff --git a/unit_test/dynarray_construct_assignop_swap_gtest.cpp b/unit_test/dynarray_construct_assignop_swap_gtest.cpp
@@ -315,6 +315,21 @@ TEST_F(dynarrayConstructTest, constructMoveOnlyIterator)
 #endif
 
 
+TEST_F(dynarrayConstructTest, copyConstruct)
+{
+	using Al = StatefulAllocator<TrivialRelocat>;
+	auto x = dynarray< TrivialRelocat, Al >({TrivialRelocat{0.5}}, Al(-5));
+	EXPECT_EQ(1, g_allocCount.nAllocations);
+
+	auto y = dynarray(x);
+	EXPECT_EQ(-5, y.get_allocator().id);
+	EXPECT_EQ(2, g_allocCount.nAllocations);
+
+	auto z = dynarray(y, Al(7));
+	EXPECT_EQ(0.5, *z.front());
+	EXPECT_EQ(3, g_allocCount.nAllocations);
+}
+
 template<typename Alloc>
 void testMoveConstruct(Alloc a0, Alloc a1)
 {