From patchwork Wed Jun 23 09:53:31 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paolo Carlini <paolo.carlini@oracle.com>
X-Patchwork-Id: 56621
Return-Path: 
 <gcc-patches-return-266079-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 718EBB6EE9
	for <incoming@patchwork.ozlabs.org>;
	Wed, 23 Jun 2010 19:53:42 +1000 (EST)
Received: (qmail 7216 invoked by alias); 23 Jun 2010 09:53:40 -0000
Received: (qmail 7201 invoked by uid 22791); 23 Jun 2010 09:53:40 -0000
X-SWARE-Spam-Status: No, hits=-2.0 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_NONE
X-Spam-Check-By: sourceware.org
Received: from vsmtp1.tin.it (HELO vsmtp1.tin.it) (212.216.176.141) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Wed, 23 Jun 2010 09:53:34 +0000
Received: from [192.168.0.4] (79.25.196.184) by vsmtp1.tin.it (8.0.022) id
	4B9917F00A5520C5; Wed, 23 Jun 2010 11:53:31 +0200
Message-ID: <4C21D99B.6070200@oracle.com>
Date: Wed, 23 Jun 2010 11:53:31 +0200
From: Paolo Carlini <paolo.carlini@oracle.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.9) Gecko/20100317 SUSE/3.0.4-1.1.1 Thunderbird/3.0.4
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
CC: libstdc++ <libstdc++@gcc.gnu.org>
Subject: [v3] Minor inline tweak to stl_tree.h
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hi,

noticed while working on something else. Committed to mainline.

Paolo.

///////////////
2010-06-23  Paolo Carlini <paolo.carlini@oracle.com>

	* include/bits/stl_tree.h (erase(iterator), erase(const_iterator)):
	Remove inline specifier.

Index: include/bits/stl_tree.h
===================================================================
--- include/bits/stl_tree.h	(revision 161240)
+++ include/bits/stl_tree.h	(working copy)
@@ -1358,7 +1358,7 @@
   // DR 130. Associative erase should return an iterator.
   template<typename _Key, typename _Val, typename _KeyOfValue,
            typename _Compare, typename _Alloc>
-    inline typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
+    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
     _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
     erase(iterator __position)
     {
@@ -1377,7 +1377,7 @@
   // DR 130. Associative erase should return an iterator.
   template<typename _Key, typename _Val, typename _KeyOfValue,
            typename _Compare, typename _Alloc>
-    inline typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::const_iterator
+    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::const_iterator
     _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
     erase(const_iterator __position)
     {