Mailing-List:	contact cygwin-apps-help AT cygwin DOT com; run by ezmlm
Sender:	cygwin-apps-owner AT cygwin DOT com
List-Subscribe:	<mailto:cygwin-apps-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin-apps/>
List-Post:	<mailto:cygwin-apps AT cygwin DOT com>
List-Help:	<mailto:cygwin-apps-help AT cygwin DOT com>, <http://sources.redhat.com/lists.html#faqs>
Mail-Followup-To:	cygwin-apps AT cygwin DOT com
Delivered-To:	mailing list cygwin-apps AT cygwin DOT com
Date:	Tue, 04 Jun 2002 11:24:51 -0400
From:	Jason Tishler <jason AT tishler DOT net>
Subject:	Re: rebasing new packages?!
In-reply-to:	<20020506145630.GM1668@tishler.net>
To:	cygwin-apps AT cygwin DOT com, Robert Collins <robert DOT collins AT itdomain DOT com DOT au>
Mail-followup-to:	cygwin-apps AT cygwin DOT com,
	Robert Collins <robert DOT collins AT itdomain DOT com DOT au>
Message-id:	<20020604152451.GB1588@tishler.net>
MIME-version:	1.0
User-Agent:	Mutt/1.3.24i
References:
	<FC169E059D1A0442A04C40F86D9BA7600C5FAE AT itdomain003 DOT itdomain DOT net DOT au>
	<20020506145630 DOT GM1668 AT tishler DOT net>

--Boundary_(ID_cuysyjNJJmVYvd2z1VfQxw)
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Content-disposition: inline

Rob,

On Mon, May 06, 2002 at 10:56:30AM -0400, Jason Tishler wrote:
> On Sat, May 04, 2002 at 09:37:48AM +1000, Robert Collins wrote:
> > > -----Original Message-----
> > > From: Jason Tishler [mailto:jason AT tishler DOT net] 
> > > Sent: Saturday, May 04, 2002 3:34 AM
> > > 
> > > Can we remove the "-Werror" option and start using STL in setup.exe?
> > 
> > [snip]
> >
> > Perhaps removing the explicit inline from the definition is appropriate?
> 
> Bingo.  That fixed the problem.

Actually, the previous patch caused multiple definition errors during
linking.  Is the attached an acceptable alternative?

Thanks,
Jason

--Boundary_(ID_cuysyjNJJmVYvd2z1VfQxw)
Content-type: text/plain; charset=us-ascii; NAME=stl_tree.h-2.diff
Content-transfer-encoding: 7BIT
Content-disposition: attachment; filename=stl_tree.h-2.diff

--- stl_tree.h.orig	2002-05-06 10:38:33.000000000 -0400
+++ stl_tree.h	2002-06-03 15:41:11.000000000 -0400
@@ -1253,7 +1253,7 @@ _Rb_tree<_Key, _Value, _KoV, _Compare, _
                                              upper_bound(__k));
 }
 
-inline int 
+static int 
 __black_count(_Rb_tree_node_base* __node, _Rb_tree_node_base* __root)
 {
   if (__node == 0)

--Boundary_(ID_cuysyjNJJmVYvd2z1VfQxw)--

- Raw text -