From 9eab6db97fccd07e9e4b83f50ee19b6fc966db6a Mon Sep 17 00:00:00 2001 From: marius Date: Tue, 29 Apr 2014 11:31:22 +0000 Subject: Merge r133175 from upstream: 2008-03-13 Dennis Czeremin PR libstdc++/35566 * include/bits/stl_multimap.h (multimap<>::multimap(_InputIterator, _InputIterator)): Forward to _M_insert_equal, not _M_insert_unique. This patch was GPL2 at the time and fixes a regression introduced with the merge of GCC r129013 in FreeBSD r236829. MFC after: 3 days Sponsored by: Bally Wulff Games & Entertainment GmbH --- contrib/libstdc++/include/bits/stl_multimap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/libstdc++/include/bits/stl_multimap.h b/contrib/libstdc++/include/bits/stl_multimap.h index bb1c154..85feba7 100644 --- a/contrib/libstdc++/include/bits/stl_multimap.h +++ b/contrib/libstdc++/include/bits/stl_multimap.h @@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) template multimap(_InputIterator __first, _InputIterator __last) : _M_t() - { _M_t._M_insert_unique(__first, __last); } + { _M_t._M_insert_equal(__first, __last); } /** * @brief Builds a %multimap from a range. -- cgit v1.1