Author: marius
Date: Fri May 2 10:31:12 2014
New Revision: 265221
URL: http://svnweb.freebsd.org/changeset/base/265221
Log:
MFC: r265090
Merge r133175 from upstream:
2008-03-13 Dennis Czeremin <dennis.czere...@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 (merged to stable/9 in r237507).
Sponsored by: Bally Wulff Games & Entertainment GmbH
Modified:
stable/9/contrib/libstdc++/include/bits/stl_multimap.h
Directory Properties:
stable/9/contrib/libstdc++/ (props changed)
Modified: stable/9/contrib/libstdc++/include/bits/stl_multimap.h
==============================================================================
--- stable/9/contrib/libstdc++/include/bits/stl_multimap.h Fri May 2
10:29:54 2014 (r265220)
+++ stable/9/contrib/libstdc++/include/bits/stl_multimap.h Fri May 2
10:31:12 2014 (r265221)
@@ -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.
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
