diff options
| author | marius <marius@FreeBSD.org> | 2014-04-29 11:31:22 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2014-04-29 11:31:22 +0000 |
| commit | 9eab6db97fccd07e9e4b83f50ee19b6fc966db6a (patch) | |
| tree | b79de7e3d3d16dd54393babd7083b2cbe3b4b6c4 | |
| parent | 64e6f8242969881f4ab570a9f385785d85560d35 (diff) | |
| download | FreeBSD-src-9eab6db97fccd07e9e4b83f50ee19b6fc966db6a.zip FreeBSD-src-9eab6db97fccd07e9e4b83f50ee19b6fc966db6a.tar.gz | |
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
| -rw-r--r-- | contrib/libstdc++/include/bits/stl_multimap.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 <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. |
