Correct set::emplace and set::emplace_hint

morzhovets · Dec 10, 2023 · de3fa86 · de3fa86
1 parent 1a335e6
commit de3fa86
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/include/momo/stdish/set.h b/include/momo/stdish/set.h
@@ -474,6 +474,15 @@ class set
 		return { res.position, res.inserted };
 	}
 
+	template<typename ValueArg>
+	momo::internal::EnableIf<std::is_same<key_type, typename std::decay<ValueArg>::type>::value,
+	std::pair<iterator, bool>> emplace(ValueArg&& valueArg)
+	{
+		typename TreeSet::InsertResult res = mTreeSet.InsertVar(
+			static_cast<const key_type&>(valueArg), std::forward<ValueArg>(valueArg));
+		return { res.position, res.inserted };
+	}
+
 	template<typename... ValueArgs>
 	iterator emplace_hint(const_iterator hint, ValueArgs&&... valueArgs)
 	{
@@ -486,6 +495,15 @@ class set
 		return mTreeSet.Add(hint, std::move(extItem));
 	}
 
+	template<typename ValueArg>
+	momo::internal::EnableIf<std::is_same<key_type, typename std::decay<ValueArg>::type>::value,
+	iterator> emplace_hint(const_iterator hint, ValueArg&& valueArg)
+	{
+		if (!pvCheckHint(hint, static_cast<const key_type&>(valueArg)))
+			return emplace(std::forward<ValueArg>(valueArg)).first;
+		return mTreeSet.AddVar(hint, std::forward<ValueArg>(valueArg));
+	}
+
 	iterator erase(const_iterator where)
 	{
 		return mTreeSet.Remove(where);

diff --git a/test/sources/libcxx/multiset/emplace_hint.pass.cpp b/test/sources/libcxx/multiset/emplace_hint.pass.cpp
@@ -78,6 +78,10 @@ void main()
         assert(r == m.begin());
         assert(m.size() == 1);
         assert(*r == 2);
+        r = m.emplace_hint(m.cend(), M::value_type(1));
+        assert(r == m.begin());
+        assert(m.size() == 2);
+        assert(*r == 1);
     }
 #ifdef LIBCPP_TEST_MIN_ALLOCATOR
     {