Date: Tue, 29 Apr 2014 11:31:23 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265090 - head/contrib/libstdc++/include/bits Message-ID: <201404291131.s3TBVNm1000480@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marius Date: Tue Apr 29 11:31:22 2014 New Revision: 265090 URL: http://svnweb.freebsd.org/changeset/base/265090 Log: Merge r133175 from upstream: 2008-03-13 Dennis Czeremin <dennis.czeremin@smiths-heimann.com> 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 Modified: head/contrib/libstdc++/include/bits/stl_multimap.h Modified: head/contrib/libstdc++/include/bits/stl_multimap.h ============================================================================== --- head/contrib/libstdc++/include/bits/stl_multimap.h Tue Apr 29 07:48:07 2014 (r265089) +++ head/contrib/libstdc++/include/bits/stl_multimap.h Tue Apr 29 11:31:22 2014 (r265090) @@ -185,7 +185,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GL template <typename _InputIterator> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404291131.s3TBVNm1000480>