From owner-svn-src-head@FreeBSD.ORG  Tue Apr 29 11:31:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4744D2E0;
 Tue, 29 Apr 2014 11:31:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 33F221747;
 Tue, 29 Apr 2014 11:31:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TBVNrG000481;
 Tue, 29 Apr 2014 11:31:23 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TBVNm1000480;
 Tue, 29 Apr 2014 11:31:23 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201404291131.s3TBVNm1000480@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Tue, 29 Apr 2014 11:31:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265090 - head/contrib/libstdc++/include/bits
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Apr 2014 11:31:23 -0000

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.