diff options
| author | pfg <pfg@FreeBSD.org> | 2012-06-10 02:04:11 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2012-06-10 02:04:11 +0000 |
| commit | 604fef60a73f1b747d3a773bbf9822a6a505d85d (patch) | |
| tree | b4310b1434d6fbc140b23fb644abb1183568ff52 /contrib/libstdc++/include/bits/stl_multimap.h | |
| parent | 723899fa5c91cf5bb546942f05ad02ffb04560cf (diff) | |
| download | FreeBSD-src-604fef60a73f1b747d3a773bbf9822a6a505d85d.zip FreeBSD-src-604fef60a73f1b747d3a773bbf9822a6a505d85d.tar.gz | |
Bring a couple of libstdc++ patches from Apple's llvm-gcc project.
Modified Fri Jul 10 07:44:34 2009 CDT by rafael
backport part of
http://gcc.gnu.org/ml/gcc-cvs/2007-10/msg00118.html
The patch is for libstdc++ and it was GPL2 at the time.
Modified Tue Apr 29 01:20:19 2008 CDT by asl
Backport from mainline (pre-GPLv3).
Fix for sizeof(const void*) > sizeof(unsigned long).
Approved by: jhb (mentor)
MFC after: 2 weeks
Diffstat (limited to 'contrib/libstdc++/include/bits/stl_multimap.h')
| -rw-r--r-- | contrib/libstdc++/include/bits/stl_multimap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libstdc++/include/bits/stl_multimap.h b/contrib/libstdc++/include/bits/stl_multimap.h index b11b6e4..bb1c154 100644 --- a/contrib/libstdc++/include/bits/stl_multimap.h +++ b/contrib/libstdc++/include/bits/stl_multimap.h @@ -152,7 +152,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) * @brief Default constructor creates no elements. */ multimap() - : _M_t(_Compare(), allocator_type()) { } + : _M_t() { } // for some reason this was made a separate function /** @@ -184,8 +184,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD) */ template <typename _InputIterator> multimap(_InputIterator __first, _InputIterator __last) - : _M_t(_Compare(), allocator_type()) - { _M_t._M_insert_equal(__first, __last); } + : _M_t() + { _M_t._M_insert_unique(__first, __last); } /** * @brief Builds a %multimap from a range. |
